removing dep on underscore, as it's not used
clean up imports