clean up last commit

Change-Id: I899bb0d4ebbbdf481d441319e1f3fc57d8b124c2