cleanup keys, add undo-only