Change Request: database cleanup