Cleaning up some debug code