Removed unused variables in PersistenceBuilder
Merge pull request #667