SWITCHYARD-1234 more editor cleanup from model changes