removing unneeded, or at least trying to