Got rid of some more unnecessary virtuals