Cleanup codegen