Cleaned up using statements
Merge pull request #2846 from stankovski/refactoring

Cleaned up using statements