Added remove_timeout to producer