Removed debugging pdt.set_trace()s