[mdr] Clean up