remove old watch code