Second cleaning attempt

Change-Id: I4d01aee5a0fb4fdf0520eee496620d3c529efeec