Removed some unnecassary code