emove deprecated overrides and unused method