Global namespace cleanup