more cleanup to output