Fix recordStore cleanup bug
Merge pull request #473 from PinZhang/pzhang/recordstore-cleanup

Fix recordStore cleanup bug