removing un needed code