diff --git a/lib/NGCP/Panel/Controller/Billing.pm b/lib/NGCP/Panel/Controller/Billing.pm
index bf30e58893..ae3ac87c58 100644
--- a/lib/NGCP/Panel/Controller/Billing.pm
+++ b/lib/NGCP/Panel/Controller/Billing.pm
@@ -268,7 +268,6 @@ sub zones_create :Chained('zones_list') :PathPart('create') :Args(0) {
                  $form->fif,
              );
         if($c->stash->{close_target}) {
-            # TODO: set created zone in flash to be selected at target
             $c->response->redirect($c->stash->{close_target});
             return;
         }
diff --git a/lib/NGCP/Panel/Controller/Contact.pm b/lib/NGCP/Panel/Controller/Contact.pm
index d9cdce16a7..c809f2e2c1 100644
--- a/lib/NGCP/Panel/Controller/Contact.pm
+++ b/lib/NGCP/Panel/Controller/Contact.pm
@@ -56,7 +56,6 @@ sub create :Chained('list') :PathPart('create') :Args(0) {
     );
     if($form->validated) {
         if($c->stash->{close_target}) {
-            # TODO: set created contact in flash to be selected at target
             $c->response->redirect($c->stash->{close_target});
             return;
         }
diff --git a/lib/NGCP/Panel/Controller/Contract.pm b/lib/NGCP/Panel/Controller/Contract.pm
index 4d061e10d9..07ad19da4b 100644
--- a/lib/NGCP/Panel/Controller/Contract.pm
+++ b/lib/NGCP/Panel/Controller/Contract.pm
@@ -56,7 +56,6 @@ sub create :Chained('list') :PathPart('create') :Args(0) {
     );
     if($form->validated) {
         if($c->stash->{close_target}) {
-            # TODO: set created contract in flash to be selected at target
             $c->response->redirect($c->stash->{close_target});
             return;
         }
diff --git a/lib/NGCP/Panel/Controller/Domain.pm b/lib/NGCP/Panel/Controller/Domain.pm
index 6c167b467b..aa27e03146 100644
--- a/lib/NGCP/Panel/Controller/Domain.pm
+++ b/lib/NGCP/Panel/Controller/Domain.pm
@@ -158,7 +158,6 @@ sub preferences_detail :Chained('base') :PathPart('preferences') :CaptureArgs(1)
         ->resultset('voip_domains')
         ->single({domain => $c->stash->{domain}->{domain}})->id;
 
-    # TODO this can return more than one row
     $c->stash->{preference} = $c->model('provisioning')
         ->resultset('voip_dom_preferences')
         ->search({attribute_id => $pref_id, domain_id => $c->stash->{provisioning_domain_id}});
@@ -200,7 +199,6 @@ sub preferences_edit :Chained('preferences_detail') :PathPart('edit') :Args(0) {
         );
     }
     if($posted && $form->validated) {
-        # TODO: if meta->max_occur=0 insert, otherwise insert_or_update
         my $preference_id = $c->stash->{preference}->first ? $c->stash->{preference}->first->id : undef;
         if ($c->stash->{preference_meta}->max_occur != 1) {
             $c->model('provisioning')
diff --git a/lib/NGCP/Panel/Controller/Root.pm b/lib/NGCP/Panel/Controller/Root.pm
index 228d57f225..bfab87b5cf 100644
--- a/lib/NGCP/Panel/Controller/Root.pm
+++ b/lib/NGCP/Panel/Controller/Root.pm
@@ -206,7 +206,6 @@ sub ajax_process_resultset :Private {
             $rs = $rs->search({ id => { '!=', $iIdOnTop}});
         }
     }
-    #TODO: influences pagination, as there is now one additional row
     
     #Sorting
     if(defined($iSortCol_0) && defined($sSortDir_0)) {
diff --git a/lib/NGCP/Panel/Form/BillingProfile.pm b/lib/NGCP/Panel/Form/BillingProfile.pm
index 3842106985..46c08730e0 100644
--- a/lib/NGCP/Panel/Form/BillingProfile.pm
+++ b/lib/NGCP/Panel/Form/BillingProfile.pm
@@ -33,7 +33,7 @@ has_field 'interval_free_cash' => (
 );
 
 has_field 'fraud_interval_limit' => (
-    type => 'Integer', #TODO: ???
+    type => 'Integer',
     label => 'Fraud Monthly Limit',
 );
 
@@ -56,7 +56,7 @@ has_field 'fraud_interval_notify' => (
 );
 
 has_field 'fraud_daily_limit' => (
-    type => 'Integer', #???
+    type => 'Integer',
 );
 
 has_field 'fraud_daily_lock' => (
diff --git a/lib/NGCP/Panel/Form/Preferences.pm b/lib/NGCP/Panel/Form/Preferences.pm
index 4f5b6bb88a..0080a3bf9e 100644
--- a/lib/NGCP/Panel/Form/Preferences.pm
+++ b/lib/NGCP/Panel/Form/Preferences.pm
@@ -58,8 +58,7 @@ sub field_list {
                     type => 'Text',
                 };
             } else {
-                # TODO: needs to be a list of values with the option
-                # to delete old, add new
+                # is only used to add a new field
                 $field = {
                     name => $meta->attribute,
                     type => 'Text',