remove un-needed code