remove underscore dependence