Some other namespace cleaning