cleanup + added missing gems