some cleanup (#1770)
some cleanup (#1770)

@DanSanche
GoogleCloudPlatform/java-docs-samples,GoogleCloudPlatform/java-docs-samples,GoogleCloudPlatform/java-docs-samples,GoogleCloudPlatform/java-docs-samples,GoogleCloudPlatform/java-docs-samples,GoogleCloudPlatform/java-docs-samples