Merge "removing the old FRM code"