BaseCodeGenerator cleanup code
BaseCodeGeneratorWithSite code cleanup
Cleanup code