refactor namespace cleaning