diff --git a/samples/boot/findbyusername/build.gradle b/samples/boot/findbyusername/build.gradle
index 9f979cad..11db91ef 100644
--- a/samples/boot/findbyusername/build.gradle
+++ b/samples/boot/findbyusername/build.gradle
@@ -23,7 +23,6 @@ dependencies {
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"org.springframework.boot:spring-boot-starter-web",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator",
diff --git a/samples/boot/findbyusername/src/main/resources/templates/index.html b/samples/boot/findbyusername/src/main/resources/templates/index.html
index bdc529a2..5ba3cb76 100644
--- a/samples/boot/findbyusername/src/main/resources/templates/index.html
+++ b/samples/boot/findbyusername/src/main/resources/templates/index.html
@@ -18,19 +18,19 @@
 				<th>Information</th>
 				<th>Terminate</th>
 			</tr>
-			<tr th:each="session : ${sessions}" th:with="details=${session.getAttribute('SESSION_DETAILS')}">
-				<td th:text="${session.id.substring(30)}"></td>
+			<tr th:each="sessionElement : ${sessions}" th:with="details=${sessionElement.getAttribute('SESSION_DETAILS')}">
+				<td th:text="${sessionElement.id.substring(30)}"></td>
 				<td th:text="${details.location}"></td>
-				<td th:text="${#dates.format(new java.util.Date(session.creationTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
-				<td th:text="${#dates.format(new java.util.Date(session.lastAccessedTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${#dates.format(new java.util.Date(sessionElement.creationTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
+				<td th:text="${#dates.format(new java.util.Date(sessionElement.lastAccessedTime),'dd/MMM/yyyy HH:mm:ss')}"></td>
 				<td th:text="${details.accessType}"></td>
 				<td>
-					<form th:action="@{'/sessions/' + ${session.id}}" th:method="delete">
-						<input th:id="'terminate-' + ${session.id}" type="submit" value="Terminate" th:disabled="${session.id == #httpSession.id}"/>
+					<form th:action="@{'/sessions/' + ${sessionElement.id}}" th:method="delete">
+						<input th:id="'terminate-' + ${sessionElement.id}" type="submit" value="Terminate" th:disabled="${sessionElement.id == #httpSession.id}"/>
 					</form>
 				</td>
 			</tr>
 		</table>
 	</div>
 </body>
-</html>
\ No newline at end of file
+</html>
diff --git a/samples/boot/jdbc/build.gradle b/samples/boot/jdbc/build.gradle
index c621e7fc..3a3611c7 100644
--- a/samples/boot/jdbc/build.gradle
+++ b/samples/boot/jdbc/build.gradle
@@ -22,7 +22,6 @@ dependencies {
 			"org.springframework.boot:spring-boot-starter-security",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator",
diff --git a/samples/boot/mongo/build.gradle b/samples/boot/mongo/build.gradle
index d978f919..5e6d274d 100644
--- a/samples/boot/mongo/build.gradle
+++ b/samples/boot/mongo/build.gradle
@@ -22,7 +22,6 @@ dependencies {
 			"org.springframework.boot:spring-boot-starter-security",
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator",
diff --git a/samples/boot/redis/build.gradle b/samples/boot/redis/build.gradle
index b1994c9e..526486b3 100644
--- a/samples/boot/redis/build.gradle
+++ b/samples/boot/redis/build.gradle
@@ -23,7 +23,6 @@ dependencies {
 			"org.springframework.boot:spring-boot-starter-thymeleaf",
 			"org.springframework.boot:spring-boot-starter-web",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",
 			"org.webjars:webjars-locator"
diff --git a/samples/boot/websocket/build.gradle b/samples/boot/websocket/build.gradle
index 15dfc974..9d3df68c 100644
--- a/samples/boot/websocket/build.gradle
+++ b/samples/boot/websocket/build.gradle
@@ -28,7 +28,6 @@ dependencies {
 			"org.springframework.boot:spring-boot-starter-websocket",
 			"org.springframework:spring-websocket:${springVersion}",
 			"nz.net.ultraq.thymeleaf:thymeleaf-layout-dialect",
-			"org.thymeleaf.extras:thymeleaf-extras-conditionalcomments",
 			"biz.paluch.redis:lettuce:$lettuceVersion",
 			"org.webjars:bootstrap:$bootstrapVersion",
 			"org.webjars:html5shiv:$html5ShivVersion",