Less bullshit
Configuration, heartbeat and boot-server
Minor cleanup of the order of things