COmments cleanup.