Simpler storage
Correctly destroy BookmarksManager

This fixes a crash introduced in commit 017724538f