Update dependencies + cleanup