Removed some un-needed code