Fine-tuned shape computation for dbn watcher
Cleanup