Remove old memento code