Merge "Remove virtual from methods that don't need it"