Merge "Fix typo in comments, rm debugging code"