Namespace usage cleanup