Removed un needed code