Remove duplicates and unused functions [2/2]

Change-Id: Ic63ef48d2c47a7cc168931ceda738b41db49cf3d
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>