taoshan: misc cleanup.

Change-Id: I81250f1b2a78a1025e4e422c9071d05f25456679