Investigation: Perfomance issues for data extraction

We should remove the splitting code from the dan extraction and see if we can optimize some SQL queries.