Remove System.out usage