Simplify boot storage

temporary means, before I merge pull request ;)