Removes obsolete code
Re-aligns parsing of the F parameter structure (after Cliff's changes)