clean up JID resource splitting code