remove non needed code