remove unneccessary code