Cleanup and start work on querying dataset.