Clean up some more debug stuff.