Removing most log statements