Remove unneeded virtual calls