take off unneccessary code