Update versions
Cleanup hard-coded versions