remove mustache and simplify parsing