cleanup AGAIN

Change-Id: Icb134ebcb5712e8b54b35cdd87390aaab1fb041e