Removed old namespace