The following needs to be done:
1. Create a list of tickets with code and tests to remove and mark them as “is depended on by” this ticket. This will assist the Upgrade/Downgrade Team in tracking progress.

2. Complete said tickets promptly.
3. Create a ticket identifying Query-related generic upgrade/downgrade references that the Upgrade/Downgrade team should update now that the 3.6-dependent references have been removed.