diff --git a/src/main/java/gov/cabinetoffice/gap/applybackend/service/GrantMandatoryQuestionService.java b/src/main/java/gov/cabinetoffice/gap/applybackend/service/GrantMandatoryQuestionService.java
index bcaea21..fe2bece 100644
--- a/src/main/java/gov/cabinetoffice/gap/applybackend/service/GrantMandatoryQuestionService.java
+++ b/src/main/java/gov/cabinetoffice/gap/applybackend/service/GrantMandatoryQuestionService.java
@@ -136,7 +136,7 @@ public String generateNextPageUrl(String url, UUID mandatoryQuestionId, String a
     public void addMandatoryQuestionsToSubmissionObject(final GrantMandatoryQuestions mandatoryQuestions) {
         final Submission submission = mandatoryQuestions.getSubmission();
 
-        if (submission != null && submission.getScheme().getVersion() > 1) { // TODO: should we check scheme version instead of submission version?
+        if (submission != null && submission.getScheme().getVersion() > 1) {
 
             log.info("Adding mandatory question responses to submission " + submission.getId());