Removed some unused namespaces