FMS+RP Analysis Miscellaneous Clean-Up Tasks