Clean up some debugging clutter