Cleanup: undo debugging changes to get this branch ready for review.