Not surprised at all. It keeps with most traditions in which we get rid of the villain before the finale and then the finale sets up the next year–except this time it’s wrapping the season.
Well last Season we had the Black Fairy still around for the finale, and Isaac was still around for the Season 4 finale. But yeah, it’s more common for the arc villain to be gone after the 20th episode.