Removing manual namespace tracking