Remove depreciated namespaces