I think there should be !
Why? To be honest I would have prefered the manga if Kaguya was never introduced and Madara was the final villain. After all Madara was foreshadowed for the series back in part 1(in the final valley with the big statue of him and hashirama) and his appearance makes...