Cleanup some code in menu