Remove unused import and classes