Cleaned and simplified the whole startup procedure

Change-Id: Ia424d5ae482dd56f5e5b0cf50d758944d3626181