Making Sonar happy happy!  Removing complexities...