Removed Unneccessary code