This MR proposes a better cleanup of the migration that was used to shift users to the new supervision ecosystem.

It also avoids the issue encountered with !388 (merged) and !391 (merged)

Fixes #569 (closed)