Honestly, they should extend the gutting to the expansion storylines next. ARR had some nasty filler, but Heavensward and Stormblood could do with some streamlining.