Cleanup, remove unnecessary success var.