For #56 removed IDataServiceQueryProvider. For #57 removed dataservice everywhere except when referring to version.  made a lot cleanup like fixed