(FBACores CPS2 XDK1)  Some more cleanups