Cleaning up some debuggin