Removed not needed code