Remove old watch(), start(), end() methods