remove data-set dependency