Merge "Remove expensive logging." into sc-dev