Revert changes to PersistenceSpec and further cleanup