Clean up some debugging drek
Refactoring