(FBACores CPS2) More cleanups