more removal of namespace