Cleaned some declarations of namespaces