No. All congressional districts must be de-gerrymandered and forever overseen by a non-partisan body to redo our districts as they become due. Voting needs to be safe, available, easy to register for, and open to audits by third parties. All primaries should be open primaries for so long as there are only two major parties but numerous political outlooks. You do this, and term limits will be conducted as they should always be: through elections.