Clean up logging code
Clean up logging code

SahilTikale/haas,henn/hil,meng-sun/hil,henn/haas,kylehogan/hil,kylehogan/hil,apoorvemohan/haas,henn/hil_sahil,henn/hil_sahil,lokI8/haas,CCI-MOC/haas,apoorvemohan/haas,SahilTikale/switchHaaS,henn/hil,meng-sun/hil,kylehogan/haas