Remove unused references in FDO and FdoUi

Change-Id: I542a71c7eacbf3c53b2b219cc024e734d3314435