removed un needed code