Eliminating the bootstrap profile and refactoring the site.pp to reflect a unified resource catalog.