Clean up "Watched" again, to support #117 changes.

is this needed or is there a way of invoking migration 6 again?