Cleanup

Change-Id: I37831eb539297ccc1216cfff5fa94a5b2ee98f6a
Cleanup2

Change-Id: I712b290c6bf29869730323220b1a89846629eba8