Removed unused class
Refactorings
Refactorings