Removed last traces of FF code from JK2 carryover.