Clean up required versions
Another attempt at variable substitution
Yet another attempt at variable substitution