Re-arranged Erase functionality