[class] clean up, remove global type dict