Refactored WFCR code - removed unused persistent data