unnecessary class removed, no more module imports