WCMIO-3: removed unnecessary client libs includes