Remove namespace + tokens working