remove un-neccessary code