Revert "Add namespace"

This reverts commit 2b97bc104cd5ed78f447e0fc03f28527582e8281.