No headnode macaddrs

Prompted by it coming up in the demo this afternoon, I decided to just get rid of this now.

Note that this incorporates the changes from #280, so that should be reviewed first.