(FBACores CPS2) Remove CPS1 portions