Removed redundant code from PersistenceManager