Removed references to entries and tables from database