getting rid of not needed code