Removing puppet and ruby, minor clean ups