Remove hack for underlying and classdata.