Cleanup

Change-Id: I704db3b22087358bb7631738b0545e9674e52ce0