fix warnings and remove some debug logs
Authored by: rmottola 2015-10-13
Parent: [r469]
Child: [r471]
