Removed aggregation query, far too slow