Revert "Clean"

This reverts commit 678366ee5f688c5531835780b820f7dc6a3cb89f.
Namespace fix