Get rid of namespace utility, code cleanup.