Undo more unnecessary changes