clean up some old debugging/test/cruft stuff