You know, yeah Rosie has officially outlived his usefulness.
If he doesn't end up killed off, though, I hope that this is the wake-up call for him to get over himself and actually be better - for all of his loyalty to the Princess, he doesn't really seem to respect her wishes.