diff --git a/db/ddlutils/oracle/procedures/DBA_Cleanup.sql b/db/ddlutils/oracle/procedures/DBA_Cleanup.sql
index d560d89eac..ff4249cb2f 100644
--- a/db/ddlutils/oracle/procedures/DBA_Cleanup.sql
+++ b/db/ddlutils/oracle/procedures/DBA_Cleanup.sql
@@ -8,79 +8,82 @@ CREATE OR REPLACE PROCEDURE DBA_Cleanup
  *************************************************************************
  * $Id: DBA_Cleanup.sql,v 1.1 2006/04/21 17:51:58 jjanke Exp $
  ***
- * Title:	Cleanup old temporary data
+ * Title:    Cleanup old temporary data
  * Description:
  *
  * Author: Teo Sarca, www.arhipac.ro
- *			* Autodetect temporary tables and delete rows that are older then 7 days
+ *            * Autodetect temporary tables and delete rows that are older then 7 days
  ************************************************************************/
 AS
 BEGIN
-	DBMS_OUTPUT.PUT_LINE('DBA_Cleanup');
-	--  Clean up data
+    DBMS_OUTPUT.PUT_LINE('DBA_Cleanup');
+    --  Clean up data
     /**
---	C_Invoice_CheckPaid();
+--    C_Invoice_CheckPaid();
     UPDATE C_Payment_v 
       SET IsAllocated=CASE WHEN paymentAllocated(C_Payment_ID, C_Currency_ID)=PayAmt THEN 'Y' ELSE 'N' END
     WHERE IsAllocated='N';
-    UPDATE C_Invoice_v1	
- 	  SET IsPaid = CASE WHEN invoicePaid(C_Invoice_ID,C_Currency_ID,MultiplierAP)=GrandTotal THEN 'Y' ELSE 'N' END 
+    UPDATE C_Invoice_v1    
+       SET IsPaid = CASE WHEN invoicePaid(C_Invoice_ID,C_Currency_ID,MultiplierAP)=GrandTotal THEN 'Y' ELSE 'N' END 
     WHERE IsPaid='N';
     **/
-	
-	--  Temporary Tables
-	FOR t IN (SELECT t.TableName FROM AD_Table t
-				WHERE t.TableName like 'T!_%' ESCAPE '!'
-				AND t.IsView='N'
-				AND EXISTS (SELECT 1 FROM user_tables ut WHERE UPPER(ut.table_name)=UPPER(t.TableName))
-				AND EXISTS (SELECT 1 FROM user_tab_cols uc WHERE UPPER(uc.table_name)=UPPER(t.TableName) AND uc.column_name='AD_PINSTANCE_ID')
-				ORDER BY t.TableName)
-	LOOP
-		EXECUTE IMMEDIATE
-			'DELETE FROM '||t.TableName||' t'
-			||' WHERE EXISTS (SELECT 1 FROM AD_PInstance pi WHERE pi.AD_PInstance_ID=t.AD_PInstance_ID AND Created < SysDate-7)'
-		;
-		IF (SQL%ROWCOUNT <> 0) THEN
-			DBMS_OUTPUT.PUT_LINE(' '||t.TableName||'=' || SQL%ROWCOUNT);
-		END IF;
-	END LOOP;
     
-	--	Search Info
-	DELETE FROM AD_Find WHERE Created < SysDate-7;
+    --  Temporary Tables
+    FOR t IN (SELECT t.TableName FROM AD_Table t
+                WHERE t.TableName like 'T!_%' ESCAPE '!'
+                AND t.IsView='N'
+                AND EXISTS (SELECT 1 FROM user_tables ut WHERE UPPER(ut.table_name)=UPPER(t.TableName))
+                AND EXISTS (SELECT 1 FROM user_tab_cols uc WHERE UPPER(uc.table_name)=UPPER(t.TableName) AND uc.column_name='AD_PINSTANCE_ID')
+                ORDER BY t.TableName)
+    LOOP
+        EXECUTE IMMEDIATE
+            'DELETE FROM '||t.TableName||' t'
+            ||' WHERE EXISTS (SELECT 1 FROM AD_PInstance pi WHERE pi.AD_PInstance_ID=t.AD_PInstance_ID AND Created < SysDate-7)'
+        ;
+        IF (SQL%ROWCOUNT <> 0) THEN
+            DBMS_OUTPUT.PUT_LINE(' '||t.TableName||'=' || SQL%ROWCOUNT);
+        END IF;
+    END LOOP;
+    
+    /**  Search Info -- AD_Find not used in adempiere
+    DELETE FROM AD_Find WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' AD_Find=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' AD_Find=' || SQL%ROWCOUNT);
     END IF;
+    */
     
-	--	Processes older than a week
-	DELETE FROM AD_PInstance WHERE Created < SysDate-7;
+    /**  Processes older than a week -- audit data better configured using HouseKeeping
+    DELETE FROM AD_PInstance WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_PInstance=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_PInstance=' || SQL%ROWCOUNT);
     END IF;
-    
-    /**  Old Session (1 Week) 
+    --  Change Log -- audit data better configured using HouseKeeping
     DELETE FROM AD_ChangeLog WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_ChangeLock=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_ChangeLock=' || SQL%ROWCOUNT);
     END IF;
+    --  Old Session (1 Week) -- audit data better configured using HouseKeeping
     DELETE FROM AD_Session WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_Session=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_Session=' || SQL%ROWCOUNT);
     END IF;
-    /**    */
+    */
 
-	--	Errors older than 1 week
-	DELETE FROM AD_Error WHERE Created < SysDate-7;
+    /**  Errors older than 1 week -- AD_Error not used in Adempiere
+    DELETE FROM AD_Error WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_Error=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_Error=' || SQL%ROWCOUNT);
     END IF;
+    */
     
-	--  Acknowledged Notes older than one week
-	DELETE FROM AD_Note WHERE Processed='Y' AND Updated < SysDate-7;
+    /**  Acknowledged Notes older than one week -- audit data better configured using HouseKeeping
+    DELETE FROM AD_Note WHERE Processed='Y' AND Updated < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Processed AD_Note=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Processed AD_Note=' || SQL%ROWCOUNT);
     END IF;
+    */
     
-	--
-	COMMIT;
+    --
+    COMMIT;
 END DBA_Cleanup;
 /
diff --git a/migration/353a-trunk/oracle/457_FR2783860.sql b/migration/353a-trunk/oracle/457_FR2783860.sql
index d560d89eac..ff4249cb2f 100644
--- a/migration/353a-trunk/oracle/457_FR2783860.sql
+++ b/migration/353a-trunk/oracle/457_FR2783860.sql
@@ -8,79 +8,82 @@ CREATE OR REPLACE PROCEDURE DBA_Cleanup
  *************************************************************************
  * $Id: DBA_Cleanup.sql,v 1.1 2006/04/21 17:51:58 jjanke Exp $
  ***
- * Title:	Cleanup old temporary data
+ * Title:    Cleanup old temporary data
  * Description:
  *
  * Author: Teo Sarca, www.arhipac.ro
- *			* Autodetect temporary tables and delete rows that are older then 7 days
+ *            * Autodetect temporary tables and delete rows that are older then 7 days
  ************************************************************************/
 AS
 BEGIN
-	DBMS_OUTPUT.PUT_LINE('DBA_Cleanup');
-	--  Clean up data
+    DBMS_OUTPUT.PUT_LINE('DBA_Cleanup');
+    --  Clean up data
     /**
---	C_Invoice_CheckPaid();
+--    C_Invoice_CheckPaid();
     UPDATE C_Payment_v 
       SET IsAllocated=CASE WHEN paymentAllocated(C_Payment_ID, C_Currency_ID)=PayAmt THEN 'Y' ELSE 'N' END
     WHERE IsAllocated='N';
-    UPDATE C_Invoice_v1	
- 	  SET IsPaid = CASE WHEN invoicePaid(C_Invoice_ID,C_Currency_ID,MultiplierAP)=GrandTotal THEN 'Y' ELSE 'N' END 
+    UPDATE C_Invoice_v1    
+       SET IsPaid = CASE WHEN invoicePaid(C_Invoice_ID,C_Currency_ID,MultiplierAP)=GrandTotal THEN 'Y' ELSE 'N' END 
     WHERE IsPaid='N';
     **/
-	
-	--  Temporary Tables
-	FOR t IN (SELECT t.TableName FROM AD_Table t
-				WHERE t.TableName like 'T!_%' ESCAPE '!'
-				AND t.IsView='N'
-				AND EXISTS (SELECT 1 FROM user_tables ut WHERE UPPER(ut.table_name)=UPPER(t.TableName))
-				AND EXISTS (SELECT 1 FROM user_tab_cols uc WHERE UPPER(uc.table_name)=UPPER(t.TableName) AND uc.column_name='AD_PINSTANCE_ID')
-				ORDER BY t.TableName)
-	LOOP
-		EXECUTE IMMEDIATE
-			'DELETE FROM '||t.TableName||' t'
-			||' WHERE EXISTS (SELECT 1 FROM AD_PInstance pi WHERE pi.AD_PInstance_ID=t.AD_PInstance_ID AND Created < SysDate-7)'
-		;
-		IF (SQL%ROWCOUNT <> 0) THEN
-			DBMS_OUTPUT.PUT_LINE(' '||t.TableName||'=' || SQL%ROWCOUNT);
-		END IF;
-	END LOOP;
     
-	--	Search Info
-	DELETE FROM AD_Find WHERE Created < SysDate-7;
+    --  Temporary Tables
+    FOR t IN (SELECT t.TableName FROM AD_Table t
+                WHERE t.TableName like 'T!_%' ESCAPE '!'
+                AND t.IsView='N'
+                AND EXISTS (SELECT 1 FROM user_tables ut WHERE UPPER(ut.table_name)=UPPER(t.TableName))
+                AND EXISTS (SELECT 1 FROM user_tab_cols uc WHERE UPPER(uc.table_name)=UPPER(t.TableName) AND uc.column_name='AD_PINSTANCE_ID')
+                ORDER BY t.TableName)
+    LOOP
+        EXECUTE IMMEDIATE
+            'DELETE FROM '||t.TableName||' t'
+            ||' WHERE EXISTS (SELECT 1 FROM AD_PInstance pi WHERE pi.AD_PInstance_ID=t.AD_PInstance_ID AND Created < SysDate-7)'
+        ;
+        IF (SQL%ROWCOUNT <> 0) THEN
+            DBMS_OUTPUT.PUT_LINE(' '||t.TableName||'=' || SQL%ROWCOUNT);
+        END IF;
+    END LOOP;
+    
+    /**  Search Info -- AD_Find not used in adempiere
+    DELETE FROM AD_Find WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' AD_Find=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' AD_Find=' || SQL%ROWCOUNT);
     END IF;
+    */
     
-	--	Processes older than a week
-	DELETE FROM AD_PInstance WHERE Created < SysDate-7;
+    /**  Processes older than a week -- audit data better configured using HouseKeeping
+    DELETE FROM AD_PInstance WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_PInstance=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_PInstance=' || SQL%ROWCOUNT);
     END IF;
-    
-    /**  Old Session (1 Week) 
+    --  Change Log -- audit data better configured using HouseKeeping
     DELETE FROM AD_ChangeLog WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_ChangeLock=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_ChangeLock=' || SQL%ROWCOUNT);
     END IF;
+    --  Old Session (1 Week) -- audit data better configured using HouseKeeping
     DELETE FROM AD_Session WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_Session=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_Session=' || SQL%ROWCOUNT);
     END IF;
-    /**    */
+    */
 
-	--	Errors older than 1 week
-	DELETE FROM AD_Error WHERE Created < SysDate-7;
+    /**  Errors older than 1 week -- AD_Error not used in Adempiere
+    DELETE FROM AD_Error WHERE Created < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Old AD_Error=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Old AD_Error=' || SQL%ROWCOUNT);
     END IF;
+    */
     
-	--  Acknowledged Notes older than one week
-	DELETE FROM AD_Note WHERE Processed='Y' AND Updated < SysDate-7;
+    /**  Acknowledged Notes older than one week -- audit data better configured using HouseKeeping
+    DELETE FROM AD_Note WHERE Processed='Y' AND Updated < SysDate-7;
     IF (SQL%ROWCOUNT <> 0) THEN
-    	DBMS_OUTPUT.PUT_LINE(' Processed AD_Note=' || SQL%ROWCOUNT);
+        DBMS_OUTPUT.PUT_LINE(' Processed AD_Note=' || SQL%ROWCOUNT);
     END IF;
+    */
     
-	--
-	COMMIT;
+    --
+    COMMIT;
 END DBA_Cleanup;
 /