CLC-2911 Remove commented-out yml config