more disabled code removal