Yes, those are workarounds. But if at all possible, I'd prefer to restore the Clear All option, if for no other reason that it bothers me when frequently used commands disappear.