Cleanup

Change-Id: I332ed087ad361970067f85db4d6a5786015c31ff