removed temporary debug switch