cleanup and updated rvm version