fix: linting, dead code and move active watch into start sync

fix: linting, dead code and move active watch into start sync #1395