Clean up logging

Test: manual
Fixes: 189096266
Change-Id: I104604a9c7658d9704b92feaf7d00960da58fbf8
1 file changed