Remove unused import and use new style class