chacha: more cleanup