Cleaning up namespace