Fixing handlebars clearing/removing