bug fixed by the master of this project
Merge pull request #2 from zhoumengkang/master

performance boost related to `Remove` action & clean up