Fix cleanups to clean descendants.