Extract host stuff to proper starter-kit file
Clean up some old stuff