Better cleanup of Diag and handle readers being unplugged