Take out unnecessary <Fx23 test