remove extra unneccessary code