Removed some not needed code