removing redundant calls