[gh-809] Remove use of $success