Removed usings
Sticking with this architecture