remove unnecessary calls