Remove if in call extractor