Get rid of "mock deprecated" messages