Update for changes to FFnet scheme
Cleanup