model level cleanup tweaks