@vuntz, I guess this should be done by pacemaker/stonith recipe which already mentiones deleting resources in its FIXME. (esp. that stonith mode switch would not need to be done at other place again).
Just need to figure out the way how to run stonith before remove_from_cluster ...