More Merc cleanup