Removed calls to System.out