Cleanup

Change-Id: I6cffc6f334240ef6e2281691cf5a652260be17a9