Remove debug code and cleanup some comments.