[PATCH] bootstd: Drop some TODOs