diff --git a/compiler/riscv32/aoptcpu.pas b/compiler/riscv32/aoptcpu.pas
index 923cb69c78..202d399ac1 100644
--- a/compiler/riscv32/aoptcpu.pas
+++ b/compiler/riscv32/aoptcpu.pas
@@ -21,7 +21,6 @@
  ****************************************************************************
 }
 
-
 Unit aoptcpu;
 
 Interface
@@ -29,62 +28,14 @@ Interface
 {$i fpcdefs.inc}
 
 uses
-  cpubase,
-  aoptobj, aoptcpub, aopt, aoptcpurv,
-  aasmtai,aasmdata, aasmcpu;
+  aopt, aoptcpurv;
 
 Type
   TCpuAsmOptimizer = class(TRVCpuAsmOptimizer)
-    { uses the same constructor as TAopObj }
-    function PeepHoleOptPass1Cpu(var p: tai): boolean; override;
-
-    function PostPeepHoleOptsCpu(var p: tai): boolean; override;
   End;
 
 Implementation
 
-  uses
-    cutils, verbose, cgbase, cgcpu, cgobj;
-
-
-  function TCpuAsmOptimizer.PeepHoleOptPass1Cpu(var p: tai): boolean;
-    var
-      next1, next2: tai;
-      l1, l2, shlcount: longint;
-    begin
-      result := inherited PeepHoleOptPass1Cpu(p);
-      if result then
-        exit;
-
-      case p.typ of
-        ait_instruction:
-          begin
-            {case taicpu(p).opcode of
-            end;}
-          end;
-        else
-          ;
-      end;
-    end;
-
-
-  function TCpuAsmOptimizer.PostPeepHoleOptsCpu(var p: tai): boolean;
-    var
-      next1: tai;
-    begin
-      result := inherited PostPeepHoleOptsCpu(p);
-      if result then
-        exit;
-
-      case p.typ of
-        ait_instruction:
-          begin
-          end;
-        else
-          ;
-      end;
-    end;
-
 begin
   casmoptimizer:=TCpuAsmOptimizer;
 End.
diff --git a/compiler/riscv64/aoptcpu.pas b/compiler/riscv64/aoptcpu.pas
index 9aa8f4e26f..35379ba873 100644
--- a/compiler/riscv64/aoptcpu.pas
+++ b/compiler/riscv64/aoptcpu.pas
@@ -32,11 +32,7 @@ interface
 {$endif EXTDEBUG}
 
 uses
-  cpubase,
-  globals, globtype,
-  cgbase,
-  aoptobj, aoptcpub, aopt, aoptcpurv,
-  aasmtai, aasmcpu;
+  aopt,aoptcpurv;
 
 type