Bug fix. Clean up before new code generation.