Merge "Sonar Fix: Removed commented out lines of code"