Cleanup a bunch of debugging code.