[PFS] Fixes to avoid using .FORGET whenever possible