Remove non needed code