Clean up some work left over from debugging.