Clean up to suit recent model changes