Removed unneeded virtual methods and const arguments