cosmetic: namespace removal