Remove unused classes
Renaming class back to original name
Minimizing changes from master