100000% agree. I wish they had just left her in the tomb from s2 and only revisit it/her a few times through the series. If she had to have died it should have been during the sacrifice/curse breaking with Klaus because it would have been sort of poetic and come full circle. I hated how she died in s5.