Namespace cleanup (no functional change)