removing unnecessary calls