Cleanup. Generation is commented out