More cleanup and added RVM