[class] clean up