Cleaning println, log statements