More comment service cleanup.