[CLEANUP] Remove redundant code in Persistence