Remove more.

Change-Id: Idaf030cd369e728ec37df7107cd30062db899b7c
5 files changed