Simplify boot storage

agreed