System.out.println statements were removed in favour of using Logger
Some degree of code cleanup was performed.