Remove compatibility mock