cleaned up persistence stuff