Clean up some debug logging