Clean up remaining domain models.