cleaned host start/shutdown code

Change-Id: I3614b2085df241e191dd96335d0172532d3fab36