Remove watch function