Fixed association cleanup and resuming after that.