Cleanup

Change-Id: Ic1fbe9748759b96a9c8dd77a515aa65dcf4b93b6