Unneccessary code removed