chacha: remove more patches