model-cleanup-fixes and others