diff --git a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
index d959385d6b9..b32ee9ef528 100644
--- a/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
+++ b/hapi-fhir-base/src/main/java/ca/uhn/fhir/validation/FhirValidator.java
@@ -62,7 +62,6 @@ public class FhirValidator {
 	private final FhirContext myContext;
 	private List<IValidatorModule> myValidators = new ArrayList<>();
 	private IInterceptorBroadcaster myInterceptorBraodcaster;
-	// FIXME KHS make it clear in the docs that bundle structure is not validated when this is true
 	private boolean myConcurrentBundleValidation;
 
 	private ExecutorService myExecutorService;
@@ -330,7 +329,6 @@ public class FhirValidator {
 		myInterceptorBraodcaster = theInterceptorBraodcaster;
 	}
 
-	// FIXME KHS use this to set an executor that uses ThreadPoolUtil#newThreadPool
 	public FhirValidator setExecutorService(ExecutorService theExecutorService) {
 		myExecutorService = theExecutorService;
 		return this;
diff --git a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java
index 0c23ee9487d..f1886bb7c52 100644
--- a/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java
+++ b/hapi-fhir-server/src/main/java/ca/uhn/fhir/rest/server/interceptor/BaseValidatingInterceptor.java
@@ -314,7 +314,6 @@ public abstract class BaseValidatingInterceptor<T> extends ValidationResultEnric
 		if (myValidator != null) {
 			fhirValidator = myValidator;
 		} else {
-			// FIXME KHS this is our validator
 			fhirValidator = theRequestDetails.getServer().getFhirContext().newValidator();
 			if (myValidatorModules != null) {
 				for (IValidatorModule next : myValidatorModules) {
diff --git a/hapi-fhir-storage/pom.xml b/hapi-fhir-storage/pom.xml
index 376493a9674..7703f81824d 100644
--- a/hapi-fhir-storage/pom.xml
+++ b/hapi-fhir-storage/pom.xml
@@ -64,7 +64,7 @@
 			<artifactId>hapi-fhir-structures-hl7org-dstu2</artifactId>
 			<version>${project.version}</version>
 		</dependency>
-		<!-- FIXME KHS remove jpa stuff from here -->
+		<!-- TODO KHS remove jpa stuff from here -->
 		<dependency>
 			<groupId>ca.uhn.hapi.fhir</groupId>
 			<artifactId>hapi-fhir-jpaserver-model</artifactId>