Removed unused classes
Rename class variables
Removed unused import