Addition checks and removals for TPA system to prevent "tpa switching"