Some cleaning up of debug traces, etc
Allocate working