model cleaning/fixes