Various clean-up

Change-Id: If6255c0a4df1ab461aa428feb2f747539ccb7559