Cleaup and add rvm