trying (and failing) at more cleanup