GRADLE-2434 cleanup.