[35e] Clean up PG and FRCS #84