Support: remove unnecessary namespace