Cleanup and some rbenv work