Compiler cleanup