Got rid of most of the unneeded virtuals