cleanup of namespace usage
more namespace cleanups