Removed Unecessary code