remove un-wanted code