Removed debug code and renamed Datasource to DataSource to keep naming
consistent.