Removing Handlebars dependency