removed handlebars and consolidate