[REFACTORING] Removed unused classes