removed persistence stuff