dont strip  datasource metadata,minor code polishing