Make log nice and removed some unused lines.