improve Performance of store.remove