Second cleanup of many.