Merge "Remove a dead option"