Adapt to new templates

Change-Id: Iaf0e158e4c2cf5359c466ca4059c5304f4f746bc
Remove not useful log

Change-Id: Ib15d135516a0a53509e5b8f95b6805955d5c3f78