Cleanup

Change-Id: Id377ef9ee15a599ba4188e8046fb57f1147919b3