Removed unneccessary code