Clean up common and utils namespaces.