Remove references to RVM and clean up code