Removed ancient code.
Minor improvements.
Changed feature manager with querymanager as it seems to improve some problems reported by AJ in #82023.