improve remove performance