diff --git a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java
index a979f9be4f7..db33c2a0132 100644
--- a/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java
+++ b/hapi-fhir-jpaserver-empi/src/test/java/ca/uhn/fhir/jpa/empi/provider/EmpiProviderClearLinkR4Test.java
@@ -159,12 +159,6 @@ public class EmpiProviderClearLinkR4Test extends BaseLinkR4Test {
 		}
 	}
 
-
-	@Nonnull
-	protected EmpiLink getOnlyPractitionerLink() {
-		return myEmpiLinkDaoSvc.findEmpiLinkByTarget(myPractitioner).get();
-	}
-
 	@Nonnull
 	protected List<EmpiLink> getPractitionerLinks() {
 		return myEmpiLinkDaoSvc.findEmpiLinksByTarget(myPractitioner);
diff --git a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java
index 16b7151fab9..188e814d9ae 100644
--- a/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java
+++ b/hapi-fhir-server-empi/src/main/java/ca/uhn/fhir/empi/api/IEmpiChannelSubmitterSvc.java
@@ -25,8 +25,9 @@ import org.hl7.fhir.instance.model.api.IBaseResource;
 public interface IEmpiChannelSubmitterSvc {
 
 	/**
-	 * TODO GGG write javadoc
-	 * @param theResource
+	 * Given an IBaseResource, submit it to the EMPI channel for processing.
+	 *
+	 * @param theResource the {@link IBaseResource} that should have EMPI processing applied to it.
 	 */
 	void submitResourceToEmpiChannel(IBaseResource theResource);
 }
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java
index 05ec5145c45..17a93175992 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/provider/ProviderConstants.java
@@ -85,9 +85,7 @@ public class ProviderConstants {
 	public static final String EMPI_CLEAR = "$empi-clear";
 	public static final String EMPI_CLEAR_TARGET_TYPE = "targetType";
 	public static final String OPERATION_EMPI_BATCH_RUN = "$empi-batch-run";
-	public static final String EMPI_BATCH_RUN_TARGET_TYPE = "targetType" ;
 	public static final String EMPI_BATCH_RUN_CRITERIA= "criteria" ;
-	public static final String EMPI_BATCH_RUN_RESOURCE_IDS = "resourceIds" ;
 	public static final String OPERATION_EMPI_BATCH_RUN_OUT_PARAM_SUBMIT_COUNT = "submitted" ;
    public static final String OPERATION_EMPI_CLEAR_OUT_PARAM_DELETED_COUNT = "deleted";
 }