Extract out separate section. Remove incorrect --no-ff option.