Removed unnecessary calls.