PLA-1273 removing redundant calls