diff --git a/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_elementwise_op.hpp b/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_elementwise_op.hpp
index d2f82d3ecd..0cc43fc679 100644
--- a/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_elementwise_op.hpp
+++ b/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_elementwise_op.hpp
@@ -71,11 +71,6 @@ struct ConvElementwiseOps
     using InElementwiseOp  = typename decltype(input_op)::Op;
     using WeiElementwiseOp = typename decltype(weight_op)::Op;
     using OutElementwiseOp = typename decltype(output_op)::Op;
-   
-    // TODO: Remove, now left for compatibility. Factories do not need it anymore.
-    // using AElementwiseOp   = InElementwiseOp;
-    // using BElementwiseOp   = WeiElementwiseOp;
-    // using CDEElementwiseOp = OutElementwiseOp;
 };
 
 } // namespace ck_tile::builder::factory::internal
diff --git a/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_tensor_layout.hpp b/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_tensor_layout.hpp
index f44ce15494..8655459596 100644
--- a/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_tensor_layout.hpp
+++ b/experimental/builder/include/ck_tile/builder/factory/helpers/ck/conv_tensor_layout.hpp
@@ -226,11 +226,6 @@ struct ConvTensorLayouts
     using WeiLayout = decltype(TensorLayoutToCK<Signature.weight.config.layout>());
     using OutLayout  = decltype(TensorLayoutToCK<Signature.output.config.layout>());
     using DsLayout  = decltype(GetAuxiliaryTensorLayouts<Signature, SPATIAL_DIM>())::type;
-
-    // TODO: Remove,now left for compatibility. Factories do not need it anymore.
-    // using ALayout = InLayout;
-    // using BLayout = WeiLayout;
-    // using ELayout = OutLayout;
 };
 
 } // namespace ck_tile::builder::factory::internal