Clean up and fix RVM