Removing unused imports and tagging methods with override
PHOENIX-1137 SkipScanFilter.intersect not called for aggregate queries (Lars Hofhansl)