Removing namespace save logic