SONARJAVA-438 Remove deprecated code