Removed unecessary code