Remove default catalog creation, add a function for it. Tweak docs.