Get rid of namespace