refactor out some old junk