I still think it is so easy to write Rumpel out without killing him, that why would they bother. They could, but since Rumpel has a new baby, it seems less likely to me.
PS. Though they have been hinting in the show that Rumpel could die, so maybe it will happen.
