Removed unused class
Cleanup