Removing some traces
Several fixes to reflect newer Barrage code