adapt dead zone code to new code and a bit of cleanup
resolve confusing dead zone registry magic