Simplify boot storage

@mvidner it is not good idea as your way it means, that old instancec of class are invalid