MNT: Removed unused attribute and renamed class