remove TopStateMixin (so I can remove Lodash)
Remove lodash and fix references to underscore.string