removed unnecessary calls