Remove unused imports and convert more classes