Remove unused class
Cleanup
Cleanup