Made HCS and SA start with root. More cleanup.