Simplify boot storage

done