Remove unnecessary logic for brent crude
Fix from Andrew for querying unstructured data snapshots
Support for bucketed cs01