Removed unused imports
Store the watchers of a tracker in a lines field instead of annotations.

This way, you can edit them as Manager if that is needed.  Added an
upgrade step to migrate all existing trackers.
PPP