diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SourceParam.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SourceParam.java
index 88e82cbd4eb..34da9d85af9 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SourceParam.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/rest/param/SourceParam.java
@@ -3,9 +3,7 @@ package ca.uhn.fhir.rest.param;
 import ca.uhn.fhir.context.FhirContext;
 import ca.uhn.fhir.model.api.IQueryParameterType;
 import ca.uhn.fhir.rest.api.Constants;
-import ca.uhn.fhir.rest.server.exceptions.InvalidRequestException;
 
-import static org.apache.commons.lang3.StringUtils.defaultString;
 import static org.apache.commons.lang3.StringUtils.left;
 
 /*
diff --git a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
index e0f7bce418f..f5a1e122699 100644
--- a/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
+++ b/hapi-fhir-jpaserver-base/src/main/java/ca/uhn/fhir/jpa/dao/SearchBuilder.java
@@ -2739,7 +2739,6 @@ public class SearchBuilder implements ISearchBuilder {
 				throw new InvalidRequestException("Unexpected search parameter type encountered, expected string type for language search");
 			}
 		} else if (searchParam.getName().equals(Constants.PARAM_SOURCE)) {
-			// FIXME KHS remove this
 			if (searchParam.getParamType() == RestSearchParameterTypeEnum.TOKEN) {
 				TokenParam param = new TokenParam();
 				param.setValueAsQueryToken(null, null, null, theFilter.getValue());
diff --git a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java
index 6be8b90e511..4f1522a3f94 100644
--- a/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java
+++ b/hapi-fhir-jpaserver-searchparam/src/main/java/ca/uhn/fhir/jpa/searchparam/matcher/InMemoryResourceMatcher.java
@@ -176,10 +176,11 @@ public class InMemoryResourceMatcher {
 					} else {
 						return InMemoryMatchResult.fromBoolean(theAndOrParams.stream().anyMatch(nextAnd -> matchParams(theResourceName, theParamName, theParamDef, nextAnd, theSearchParams)));
 					}
+				case SOURCE:
+					// FIXME KHS implement
 				case COMPOSITE:
 				case HAS:
 				case SPECIAL:
-				case SOURCE:
 				default:
 					return InMemoryMatchResult.unsupportedFromParameterAndReason(theParamName, InMemoryMatchResult.PARAM);
 			}