Clean 2

Change-Id: I00ef4b186d9a9186f431bd8ee50cc1d202212f68
Reviewed-on: https://review.gerrithub.io/4893
Reviewed-by: yuriamw <yuri.amw@gmail.com>
Tested-by: yuriamw <yuri.amw@gmail.com>