Namespace cleanup.