Remove some Helm legacy
match-string -> match
Simplify code a bit