friend:clear useless code and add useful commit

Change-Id: Ib2a8736ac3ed31b8bc47ece822ce2f23c68782dc