SONARJAVA-438 Mark some code for removal as @deprecated