#8 removing some log assisting code