Fixed Danobat loading in combined queries
Remove unused code