Remove bootmenu, use new safestrap