Clean up mess part 2

Change-Id: I9b0c5b155678ad231de4a388493c25a0590ab6b6