cleanups of menu macro