Clean-up NAMESPACE