more clean up

Change-Id: I70003ba520bf6d0aac217b292449e0a0e153a394