Some Menu Cleanup work