Remove some unneccessary code