small code reorg & optimized by using remove_multi