MNT: Import cleanup