Remove unused class warnings