s4:client: Remove code inside #ifdef NEXT2