Removing unnecessary calls