Clean up some debugging code