Namespace and import cleanup