Cleanup Debug

Cleaned up some of the debugging code -- no functional fixes