Removed a last bit of handlebars and cleaned mangled rebase.
Fixed wrongly replaced `options` calls.