diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php
index d4a1f58..2eaeb30 100644
--- a/lib/Controller/PageController.php
+++ b/lib/Controller/PageController.php
@@ -186,20 +186,18 @@ class PageController extends Controller {
 		// Inject style on all templates
 		Util::addStyle($this->appName, 'forms');
 
-		// TODO: check if already submitted
-
 		try {
 			$form = $this->formMapper->findByHash($hash);
 		} catch (DoesNotExistException $e) {
 			return new TemplateResponse('forms', 'notfound');
 		}
 
-		// Does the user have permissions to display
+		// Does the user have permissions to submit (resp. submitOnce)
 		if (!$this->formsService->canSubmit($form->getId())) {
 			return new TemplateResponse('forms', 'nosubmit');
 		}
 
-		// Does the user have permissions to display
+		// Does the user have access to form
 		if (!$this->formsService->hasUserAccess($form->getId())) {
 			return new TemplateResponse('forms', 'notfound');
 		}
diff --git a/src/components/Questions/AnswerInput.vue b/src/components/Questions/AnswerInput.vue
index 6e28b9c..1652ea4 100644
--- a/src/components/Questions/AnswerInput.vue
+++ b/src/components/Questions/AnswerInput.vue
@@ -1,6 +1,5 @@
 <template>
 	<li class="question__item">
-		<!-- TODO: properly choose max length -->
 		<input
 			ref="input"
 			:aria-label="t('forms', 'An answer for the {index} option', { index: index + 1 })"
diff --git a/src/components/Questions/QuestionLong.vue b/src/components/Questions/QuestionLong.vue
index 24c9c86..f3ad1f9 100644
--- a/src/components/Questions/QuestionLong.vue
+++ b/src/components/Questions/QuestionLong.vue
@@ -31,7 +31,6 @@
 		@update:mandatory="onMandatoryChange"
 		@delete="onDelete">
 		<div class="question__content">
-			<!-- TODO: properly choose max length -->
 			<textarea ref="textarea"
 				:aria-label="t('forms', 'A long answer for the question “{text}”', { text })"
 				:placeholder="t('forms', 'Long answer text')"
diff --git a/src/components/Questions/QuestionShort.vue b/src/components/Questions/QuestionShort.vue
index 6078290..747111a 100644
--- a/src/components/Questions/QuestionShort.vue
+++ b/src/components/Questions/QuestionShort.vue
@@ -31,7 +31,6 @@
 		@update:mandatory="onMandatoryChange"
 		@delete="onDelete">
 		<div class="question__content">
-			<!-- TODO: properly choose max length -->
 			<input ref="input"
 				:aria-label="t('forms', 'A short answer for the question “{text}”', { text })"
 				:placeholder="t('forms', 'Short answer text')"