Remove unnecessary calls.