Remove untouched code due to the differentiation on handling leaf node
and unifiy the duplicate code.

Change-Id: I93337a1a8a84dfd04c35b085d51ce40bbf1ecb60