cleanup: remove diagnostic messages
cleanup: restore recovery functionality