Namespace usage cleanups