Remove nolonger needed __class__