diff --git a/lib/sequencer/unit/import/freshdesk/time_entry/mapping.rb b/lib/sequencer/unit/import/freshdesk/time_entry/mapping.rb
index 0a10cfd71..fc8a416cf 100644
--- a/lib/sequencer/unit/import/freshdesk/time_entry/mapping.rb
+++ b/lib/sequencer/unit/import/freshdesk/time_entry/mapping.rb
@@ -20,21 +20,12 @@ class Sequencer
                 }
               end
             rescue TypeError => e
-              # TODO
               # TimeTracking is not available in the plans: Sprout, Blossom
               # In this case `resource`s value is `["code", "require_feature"]`
-              # We should somehow detect that/the plan (no API available) to avoid
-              # running into this error and therefore performing unnecessary requests
               # See:
               # - Ticket# 1077135
               # - https://support.freshdesk.com/support/solutions/articles/37583-keeping-track-of-time-spent
-              #
-              # Idea: Maybe it's possible to use the "X-Ratelimit-Total"-Value from the header, because with this it
-              # should be possible to detect the plan.
-
               logger.debug { e }
-
-              # state.provide(:action, :failed)
               state.provide(:action, :skipped)
             end
 
diff --git a/spec/system/import/freshdesk_spec.rb b/spec/system/import/freshdesk_spec.rb
index 6b28069c8..b595dfc13 100644
--- a/spec/system/import/freshdesk_spec.rb
+++ b/spec/system/import/freshdesk_spec.rb
@@ -8,20 +8,6 @@ RSpec.describe 'Import Freshdesk', type: :system, set_up: false, authenticated_a
     end
   end
 
-  # TODO: check/clarify how the ENV-works in the CI-Envoirment?
-
-  # TODO: check https://git.znuny.com/zammad/zammad/-/merge_requests/1506/
-  # comment out bellow block to use VCR tape for running freshdesk import
-  # this allows to work around freshdesk rate limiting
-  # works great for debugging freshdesk locally
-  # around do |example|
-  #   VCR.temporary_ignore_regexps += [/^(\S+\.|)freshdesk.com$/, /^\S+.zdusercontent.com$/]
-
-  #   example.run
-
-  #   VCR.temporary_ignore_regexps -= [/^(\S+\.|)freshdesk.com$/, /^\S+.zdusercontent.com$/]
-  # end
-
   describe 'fields validation', :use_vcr do
     before do
       visit '#import'