Compiler code cleanup