removing not needed code