Remove a few more instances of rvm