Cleanup: (re)move usings from inside namespace