Simplify boot storage

OK, make sense