Remove test code, add comment for submenu fix