Revert "refactor remove"

This reverts commit 8b1f0bd56ff5141ab52b22e729c200f14401490c.
revert