Should only remove watchers that exist; missed a ? in the last update