More namespace cleanup
All code switches are now observable for tracking