Removed useless base class functions and added some missing overrides