QuickBoot cleanup

Change-Id: I567c3e485165085ddaf8028fed4bd97f8a8b4f73