Bug fixes
Removing lodash