removed extensive logging