remove broken watch feature