Comment fixes and removals.