isClient and isJIP cleanup