extra code removal