Menu cleanups