Can we get rid of these log.debug statements?