Hopefully helpful in testing your fix. You dont need to do anything fancy. just delete one of the "test ??" menu items under the default "tablet" menu. All items lower in the list disappear....