Remove some __HADDOCK__ CPP