Removed some unneccesary code