Clean up code gen