remove fields from classes that are not being used, and unused import statements