[CHG/FIX] Some lint refactorings and fixes
[DEL] Uneeded / duplicate classes