Removed unneeded code, added virtuals for consistency.