Simplify/improve menu removal.