Removed no longer needed namespace
Even more technical debt removed