remove lodash and update class