Added support for cleaning up after rejection messages