removed namespaces from headers