gb namespace cleanup.