Removed postmortem, moved some logic from supervisor to match