--MRG-4, more code cleanup