Fix colliding namespaces and unused imports