Merge "Removing initialization of clients that are not used"