Removed rbenv, various tweaks