Improved version of dynamic remove?
Merge conflict fixed