Cleanup with lodash