Remove unused class inheritance (and imports)