Cleanup hard-coded versions