more source cleanup

why there are so many empty lines?

Change-Id: Id9161063538d8cb02ad1159c6cc131b8a1ed6bc1
remove dmesg spam

Change-Id: Ib6c55aae0ee61371a7ca22c637dafacc8ac1933e