[#51711127] Removing unscoped calls across the application