This is to remove unused LOG and CONF to keep code clean. Change-Id: I5bca3cb114a4074fa2d837233723d1a94d1f6434