More model cleaning