Removed some unnecessary dependencies on lodash