Commented out CollapsedTraces and static stuff