CRUNCH-304: Exposed a cleanup method for consumers