Clean up

Change-Id: Id7c734d8ffb461c0a80f207a4f6f015010fe3fcd