FRCS a bit more cleanup