cleanup pass

deleted some code, some minor refactoring and cleaning up.  More to
come, but first road test is promising