finish removing heartbeat
clean up loose ends in control panel
incremental work on server master