And a few unused theUICommandDescription includes.

Change-Id: Ic80dbfb91e5e7662723efe0cb4090416994adabd