Remove duplicate and unused functions

Change-Id: I944035e720ef834561a9da0d723879a4f787312c
8 files changed