Issue refs #1422: remove not needed nodes, update api-client