Got rid of most Log statements