nanhu: cleanup

Change-Id: I269f030cc3e931c18618ca5eac82692b935afe7d