Clean the code from choco2 comments