No: HPFGUIDX 21021 JKR said that book #5 will have an "End of an era" I think it may be Dumbledore, but then I'm not sure if she would give us a huge hint toward it like that Rebekah