Dependencies update and cleanup
Fix eslint
Fix eslint