more namespace cleanup