Removed some unneccessary code.