cc-mode cleanup