Remove other namesapce usages