More model updating and clean up for latest OSATE version