Get rid of old namespaceid stuff