FRM code cleanup.