Issue refs #1540: remove custom status management and other code from client
Issue refs #1540: rename statuses, done