Removed old datasource details.
Merge remote-tracking branch 'origin/master' into testbox
removed ds stuff