Removed some unnecesary code.