Merge "Remove unused logs" into sc-dev