Clean & update RDContainer class.