ALL: Removed unneccessary code