#4137 metamodel cleanup