unnecessary calls removed