Rml cleanup