Cleaned up models for cpp generation