Reimplementation of Remove and Edit