OPAL-2427: Removing uneccessary call to get tables counts