some cleanup...still missing MR samples