Clean up mess part 1

Change-Id: I476eec485d9476340a23d915b54d581ac139496d