Remove Dynamic Data Sources in favour of Remote DS

Closes #1920