Remove comments code in a few places here.