Old "variable substitution" mechanism obsolete.
Remove "variable substitution" stuff.