Remove now unused jbidwatcher code