Removed calls to matefvs