CD-1 Cleaned up auto-generated code