internal namespace cleanup