* mdr: cleanup