Merge "Remove temporary logging." into pi-dev