Continue to fix some unused namespaces

Build 2 !