Fixed namespace
Removed unused uses