diff --git a/Model/Category/Repository.php b/Model/Category/Repository.php
index 607fee226..156a292c0 100644
--- a/Model/Category/Repository.php
+++ b/Model/Category/Repository.php
@@ -37,7 +37,6 @@
 namespace Nosto\Tagging\Model\Category;
 
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Model\Category;
 use Magento\Catalog\Model\CategoryRepository;
 use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
 use Magento\Framework\Api\SearchCriteriaBuilder;
@@ -99,7 +98,7 @@ public function getCategoryCollectionQuery(Store $store, array $categoryIds = []
             ->addNameToResult()
             ->setStoreId($store->getId())
             ->addUrlRewriteToResult()
-            ->addAttributeToFilter('level', ['gt' => 1]) // @TODO: Check if zero level categories are needed
+            ->addAttributeToFilter('level', ['gt' => 1])
             ->addAttributeToSelect(array_merge(['name', 'is_active', 'include_in_menu']))
             ->addOrderField('entity_id');
 
diff --git a/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguration.php b/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguration.php
index 2a00e3410..0f1cecee1 100644
--- a/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguration.php
+++ b/Model/Indexer/Dimensions/ModeSwitcher/ModeSwitcherConfiguration.php
@@ -40,7 +40,6 @@
 use Magento\Framework\App\Cache\TypeListInterface;
 use Magento\Framework\App\Config\ConfigResource\ConfigInterface;
 
-//@TODO: needs to be abstracted to include categories as well
 class ModeSwitcherConfiguration
 {
     public const XML_PATH_PRODUCT_INDEX_DIMENSIONS_MODE = 'indexer/nosto_index_product/dimensions_mode';
diff --git a/Model/Service/Update/CategoryUpdateService.php b/Model/Service/Update/CategoryUpdateService.php
index d805efa2d..8691dd594 100644
--- a/Model/Service/Update/CategoryUpdateService.php
+++ b/Model/Service/Update/CategoryUpdateService.php
@@ -38,7 +38,6 @@
 
 use Exception;
 use Magento\Catalog\Api\Data\CategoryInterface;
-use Magento\Catalog\Model\Category;
 use Magento\Store\Model\Store;
 use Nosto\NostoException;
 use Nosto\Tagging\Exception\ParentCategoryDisabledException;