EZP-20728: change converting to NOP to real deletion

- rename removeByAction() to remove() and add second parameter
EZP-20728: fixed deletion not to remove active entries of moved locations