Remove System.out calls