A couple of log statements removed