Cleaning menus a bit