General clean up and success display on debug