clean up namespace changes