diff --git a/README.md b/README.md
index b7decc12..3d2c8b1e 100644
--- a/README.md
+++ b/README.md
@@ -68,4 +68,9 @@ Once complete, simply go to http://127.0.0.1:8000 in your browser to see the wea
 
 # Contributing
 
-We love pull requests! The details on how to contribute to Wealthbot can be found [here](CONTRIBUTING.md).
\ No newline at end of file
+We love pull requests! The details on how to contribute to Wealthbot can be found [here](CONTRIBUTING.md).
+
+
+# Todo:
+
+* Use Webpack Encore to manage assets
\ No newline at end of file
diff --git a/config/routes/ria.yaml b/config/routes/ria.yaml
index 534461db..a8f7fdc5 100644
--- a/config/routes/ria.yaml
+++ b/config/routes/ria.yaml
@@ -311,12 +311,6 @@ rx_ria_risks_test_result:
   path: /ria/dashboard/risks/test/result
   defaults: { _controller: \App\Controller\Ria\RisksController:testResult }
 
-#TODO: delete?
-#rx_ria_risk_test_result_details:
-#    path:  /ria/dashboard/risks/test/{model_id}/details
-#    defaults: { _controller: \App\Controller\Ria\ProspectsController:riaModelDetails }
-#    requirements:
-#        model_id:  \d+
 
 rx_ria_risks_create_question:
   path:  /ria/dashboard/risks/question/create
diff --git a/public/js/ria/ria.client.js b/public/js/ria/ria.client.js
index f5f252f8..42b15291 100755
--- a/public/js/ria/ria.client.js
+++ b/public/js/ria/ria.client.js
@@ -22,7 +22,6 @@ $(function(){
         }
     });
 
-    //TODO check in IE /ria/client/create
     $(document).on('change',"#wealthbot_riabundle_riacreateclienttype_profile_model", function(event){
         $('#wealthbot_riabundle_riacreateclienttype_profile_suggested_portfolio').attr('disabled', 'disabled');
 
diff --git a/src/Entity/RiaCompanyInformation.php b/src/Entity/RiaCompanyInformation.php
index c7f3846b..7b71c4fd 100644
--- a/src/Entity/RiaCompanyInformation.php
+++ b/src/Entity/RiaCompanyInformation.php
@@ -15,7 +15,6 @@
  */
 class RiaCompanyInformation
 {
-    // @todo
     public $fees;
 
     /**
diff --git a/src/Entity/SecurityAssignment.php b/src/Entity/SecurityAssignment.php
index 2f0377f3..c5ecfcfb 100644
--- a/src/Entity/SecurityAssignment.php
+++ b/src/Entity/SecurityAssignment.php
@@ -11,7 +11,6 @@
  */
 class SecurityAssignment
 {
-    // @todo
     public $fund_symbol;
     public $asset_class_id;
 
diff --git a/templates/Ria/Billing/index.html.twig b/templates/Ria/Billing/index.html.twig
index 6e42b156..42619260 100644
--- a/templates/Ria/Billing/index.html.twig
+++ b/templates/Ria/Billing/index.html.twig
@@ -109,8 +109,6 @@
     </script>
 
     <script src="/bundles/wealthbotria/js/ria.fees.table.js"></script>
-
-    {# @TODO use bower to manage such kind of deps #}
     <script src="/js/backbone.marionette/underscore.js"></script>
     <script src="/js/backbone.marionette/backbone.js"></script>
     <script src="/js/backbone.marionette/backbone.marionette.js"></script>
diff --git a/templates/_form_div_layout.html.twig b/templates/_form_div_layout.html.twig
index 92d74142..73e71800 100644
--- a/templates/_form_div_layout.html.twig
+++ b/templates/_form_div_layout.html.twig
@@ -126,7 +126,6 @@
     {% endspaceless %}
 {% endblock datetime_widget %}
 
-{# TODO: date_pattern => pattern#}
 {% block date_widget %}
     {% spaceless %}
         {% if widget == 'single_text' %}