cleanups and added some DCViz changes to adapt to deadlocks