#9790 remove existing shoals Part2