Initial commit for thymeleaf remove