Small namespace cleanup