chacha: general cleanup