remove data , and add some fix