Removed some unneccassary code