Changes to enable hawtio to work
Cleanup of debugging leftovers