Remove Duplicate symbols and also one that we dont use yet.

Change-Id: I19e58c16852f60e039695a43f4b27f6a41cc2654