Removed some unneccesary code.