clean up namespace
update deprication warning.