Removed ancient code.
Minor improvements.
Changed feature manager with querymanager as it seems to improve some problems reported by AJ in #82023.
Merge pull request #92 from luisromangz/8.5-SNAPSHOT

Minor changes towards solving the problems indicated by AJ in #82023