Remove duplicates and unused functions [1/2]

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