[Pending review] DB cleanup