Added generic wording
Removed unused class