Cleanup

Change-Id: I02971f25806261710c3fb16bcf4297bbd1ec835b