Remove double calls