Remove watch option till further tested.