Uncomment clean code.

Change-Id: Ia17ee7f4de28fe14ba09e0c78bb3e65a81ed080c