Cleanup & boot optimization

Change-Id: I05c084494ed4ab36586ca0c1c425cfe25bfcbe6c