refactor.  remove cruft, make future testing easier.