Remove deprecated mock