Thanks for this namespace cleanup