Simplify boot storage

Where does ```p``` come from?