PHOENIX-850 Optimize ORDER BY and GROUP BY for tenant specific indexes (JamesTaylor)
Remove unused imports and add deprecate annotations