Various cleanup, removing lodash as a dependency