Optimized cancelation and removed ip check