You won't have to get rid of the AFM if you don't want to...it's never going to engage anyway. The list of parameters that must be met for 4-cylinder mode is long enough I don't see how a swap would ever satisfy them all...