Removed org.sonatype code ...