Removed uneeded test code, added __saved variable to saved menus to prevent their save state from being recreated.