Remove a few extra legacy variable feature references.