UP-4298:  Remove unused beans