Clean Up

Change-Id: I9f0583f46fea04af61f98adf4c9b6c4b5bb3ecbf