SONAR-4887 Remove backup code