Debug code removal