Remove sonar code smells from sdnc-a1-controller