Adds CompilerContext to cleanup code. Still under work