- Refactored the code to remove unused code from classes.
- Refactored methods to be called from base classes
- Removed unused import and warnings from code.