Tidy up persistence.