cleaning the house

Change-Id: Ibc7f80306722224cbe0cff41f83e33a011ad8586