Port Mark's config changes over. Remove now unused hbs module.