remove LegacyQueryController completly