SONARJAVA-438 Remove some deprecated code