QuickBoot cleanup

Change-Id: I5dc08460435a1352ad28f984bb864c4788481f82