better cleanup of kids classes