diff --git a/dspace/etc/clean-database.sql b/dspace/etc/clean-database.sql
index 3ab1da607b..339dd2db02 100644
--- a/dspace/etc/clean-database.sql
+++ b/dspace/etc/clean-database.sql
@@ -46,34 +46,18 @@
 
 
 -- Drop the views
-DROP VIEW CommunityItemsBySubject;
-DROP VIEW CollectionItemsBySubject;
-DROP VIEW CommunityItemsByDateAccession;
-DROP VIEW CollectionItemsByDateAccession;
-DROP VIEW CommunityItemsByDate;
-DROP VIEW CollectionItemsByDate;
-DROP VIEW CommunityItemsByTitle;
-DROP VIEW CollectionItemsByTitle;
-DROP VIEW CommunityItemsByAuthor;
-DROP VIEW CollectionItemsByAuthor;
 DROP VIEW Community2Item;
 DROP VIEW DCValue;
 
 -- Then the tables
+-- WARNING: The ordering below MATTERS as many tables have interdependencies
 DROP TABLE collection_item_count;
 DROP TABLE community_item_count;
 DROP TABLE checksum_history;
 DROP TABLE most_recent_checksum;
 DROP TABLE checksum_results;
-DROP TABLE ItemsBySubject;
-DROP TABLE ItemsByDateAccessioned;
-DROP TABLE ItemsByDate;
-DROP TABLE ItemsByTitle;
-DROP TABLE ItemsByAuthor;
 DROP TABLE Communities2Item;
 DROP TABLE EPersonGroup2WorkspaceItem;
-DROP TABLE HistoryState;
-DROP TABLE History;
 DROP TABLE Subscription;
 DROP TABLE RegistrationData;
 DROP TABLE TasklistItem;
@@ -85,25 +69,28 @@ DROP TABLE ResourcePolicy;
 DROP TABLE Collection2Item;
 DROP TABLE Community2Collection;
 DROP TABLE Community2Community;
-DROP TABLE Collection;
-DROP TABLE Community;
 DROP TABLE MetadataValue;
 DROP TABLE MetadataFieldRegistry;
 DROP TABLE MetadataSchemaRegistry;
 DROP TABLE Bundle2Bitstream;
 DROP TABLE Item2Bundle;
-DROP TABLE Bundle;
-DROP TABLE most_recent_checksum;
-DROP TABLE checksum_history;
-DROP TABLE checksum_results;
-DROP TABLE Item;
+DROP TABLE harvested_collection;
+DROP TABLE harvested_item;
 DROP TABLE Group2GroupCache;
 DROP TABLE Group2Group;
+DROP TABLE FileExtension;
+-- Drop main object tables near end as many other tables have dependencies on them
+DROP TABLE Community;
+DROP TABLE Collection;
+DROP TABLE Item;
+DROP TABLE Bundle;
+DROP TABLE Bitstream;
+-- BitstreamFormatRegistry is referenced by bitstreams
+DROP TABLE BitstreamFormatRegistry;
+-- People and Groups are referenced by Items, Collections, Communities
 DROP TABLE EPersonGroup;
 DROP TABLE EPerson;
-DROP TABLE Bitstream;
-DROP TABLE FileExtension;
-DROP TABLE BitstreamFormatRegistry;
+
 
 -- Now drop the sequences for ID (primary key) creation
 DROP SEQUENCE bitstreamformatregistry_seq;
@@ -130,20 +117,15 @@ DROP SEQUENCE workflowitem_seq;
 DROP SEQUENCE tasklistitem_seq;
 DROP SEQUENCE registrationdata_seq;
 DROP SEQUENCE subscription_seq;
-DROP SEQUENCE history_seq;
-DROP SEQUENCE historystate_seq;
 DROP SEQUENCE communities2item_seq;
-DROP SEQUENCE itemsbyauthor_seq;
-DROP SEQUENCE itemsbytitle_seq;
-DROP SEQUENCE itemsbydate_seq;
-DROP SEQUENCE itemsbydateaccessioned_seq;
-DROP SEQUENCE itemsbysubject_seq;
 DROP SEQUENCE epersongroup2workspaceitem_seq;
 DROP SEQUENCE metadataschemaregistry_seq;
 DROP SEQUENCE metadatafieldregistry_seq;
 DROP SEQUENCE metadatavalue_seq;
 DROP SEQUENCE group2group_seq;
 DROP SEQUENCE group2groupcache_seq;
+DROP SEQUENCE harvested_collection_seq;
+DROP SEQUENCE harvested_item_seq;
 
 -- Drop the getnextid() function
 DROP FUNCTION getnextid(VARCHAR(40));
diff --git a/dspace/etc/postgres/database_schema.sql b/dspace/etc/postgres/database_schema.sql
index f104d1d951..3b627dfd76 100644
--- a/dspace/etc/postgres/database_schema.sql
+++ b/dspace/etc/postgres/database_schema.sql
@@ -99,14 +99,11 @@ CREATE SEQUENCE workflowitem_seq;
 CREATE SEQUENCE tasklistitem_seq;
 CREATE SEQUENCE registrationdata_seq;
 CREATE SEQUENCE subscription_seq;
-CREATE SEQUENCE history_seq;
-CREATE SEQUENCE historystate_seq;
 CREATE SEQUENCE communities2item_seq;
 CREATE SEQUENCE epersongroup2workspaceitem_seq;
 CREATE SEQUENCE metadataschemaregistry_seq;
 CREATE SEQUENCE metadatafieldregistry_seq;
 CREATE SEQUENCE metadatavalue_seq;
-
 CREATE SEQUENCE group2group_seq;
 CREATE SEQUENCE group2groupcache_seq;
 CREATE SEQUENCE harvested_collection_seq;
@@ -577,10 +574,6 @@ CREATE TABLE epersongroup2workspaceitem
 CREATE INDEX epg2wi_group_fk_idx ON epersongroup2workspaceitem(eperson_group_id);
 CREATE INDEX epg2wi_workspace_fk_idx ON epersongroup2workspaceitem(workspace_item_id);
 
-------------------------------------------------------------
--- Browse subsystem tables and views
-------------------------------------------------------------
-
 -------------------------------------------------------
 --  Communities2Item table
 -------------------------------------------------------
diff --git a/dspace/etc/postgres/update-sequences.sql b/dspace/etc/postgres/update-sequences.sql
index 94eb3c4664..366a7c211a 100644
--- a/dspace/etc/postgres/update-sequences.sql
+++ b/dspace/etc/postgres/update-sequences.sql
@@ -79,14 +79,10 @@ SELECT setval('workflowitem_seq', max(workflow_id)) FROM workflowitem;
 SELECT setval('tasklistitem_seq', max(tasklist_id)) FROM tasklistitem;
 SELECT setval('registrationdata_seq', max(registrationdata_id)) FROM registrationdata;
 SELECT setval('subscription_seq', max(subscription_id)) FROM subscription;
-SELECT setval('history_seq', max(history_id)) FROM history;
-SELECT setval('historystate_seq', max(history_state_id)) FROM historystate;
 SELECT setval('communities2item_seq', max(id)) FROM communities2item;
-SELECT setval('itemsbyauthor_seq', max(items_by_author_id)) FROM itemsbyauthor;
-SELECT setval('itemsbytitle_seq', max(items_by_title_id)) FROM itemsbytitle;
-SELECT setval('itemsbydate_seq', max(items_by_date_id)) FROM itemsbydate;
-SELECT setval('itemsbydateaccessioned_seq', max(items_by_date_accessioned_id)) FROM itemsbydateaccessioned;
 SELECT setval('epersongroup2workspaceitem_seq', max(id)) FROM epersongroup2workspaceitem;
 SELECT setval('metadatafieldregistry_seq', max(metadata_field_id)) FROM metadatafieldregistry;
 SELECT setval('metadatavalue_seq', max(metadata_value_id)) FROM metadatavalue;
-SELECT setval('metadataschemaregistry_seq', max(metadata_schema_id)) FROM metadataschemaregistry;
\ No newline at end of file
+SELECT setval('metadataschemaregistry_seq', max(metadata_schema_id)) FROM metadataschemaregistry;
+SELECT setval('harvested_collection_seq', max(id)) FROM harvested_collection;
+SELECT setval('harvested_item_seq', max(id)) FROM harvested_item;
\ No newline at end of file