Remove some Helm legacy