Stripped everything for ff2 in rewrite branch in preperations for rewriting core.