Removed some unnecesary code