FW cleanup need to take ALL Fields from ruleset

[OObasuyi]

need to also make sure we take in the comments sections of the ruleset so when do a combine FW into one ACP comments presists instead of assigning a new one.