minor model clean-up