Removed last of namespace pollution