Added mechanism to delete a data source.
Merge branch 'fixes_and_enhancements'

* fixes_and_enhancements:
  Added mechanism to delete a data source.