Cleanup and prepare for boot

Change-Id: I939fca440784d4dd3dc4296d376abc6ce26f4b9a
Signed-off-by: Rashed Abdel-Tawab <rashedabdeltawab@gmail.com>