entity/persister cleanup