Vulnerability removal for TCAgen2