use filter instead of remove by hash