more cleanup to make Faceguy's life hell