replace Flush with GracefulStop everywhere