完善，除虫

Change-Id: Ib835001b89fb610ca957a44a872b40a524a743d8