Remove replace_call