diff --git a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
index 63ba392dcc..354092ee06 100644
--- a/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
+++ b/plugins/scaffolder-backend/src/scaffolder/tasks/DefaultWorkflowRunner.ts
@@ -14,7 +14,6 @@
  * limitations under the License.
  */
 import { ScmIntegrations } from '@backstage/integration';
-import { TemplateActionRegistry } from '..';
 import {
   Task,
   TaskSpec,
@@ -33,6 +32,7 @@ import { PassThrough } from 'stream';
 import { isTruthy } from './helper';
 import { validate as validateJsonSchema } from 'jsonschema';
 import { parseRepoUrl } from '../actions/builtin/publish/util';
+import { TemplateActionRegistry } from '../actions';
 
 type Options = {
   workingDirectory: string;
diff --git a/plugins/scaffolder-backend/src/service/router.ts b/plugins/scaffolder-backend/src/service/router.ts
index b75a5d0368..8e71dde461 100644
--- a/plugins/scaffolder-backend/src/service/router.ts
+++ b/plugins/scaffolder-backend/src/service/router.ts
@@ -200,8 +200,7 @@ export async function createRouter(
         }
 
         const baseUrl = getEntityBaseUrl(template);
-        // TODO: need to make sure that the TaskSpec is the right format here.
-        // If it's beta2 use values, beta3 uses parameters to clear that up.
+
         taskSpec =
           template.apiVersion === 'backstage.io/v1beta2'
             ? {