I'm assuming (have not done any real homework) that HA will unload config entries on stop. If that's correct, then a separate cleanup on stop is redundant. If that's incorrect, than I would fix this in HA :)