remove data, and add public