Removed some unecessary code