A/HRC/30/61 (i) Take immediate steps to identify and disarm groups affiliated with political parties, and sever their linkages with the security forces, intelligence services and other government authorities; (j) Initiate a high-level review of the Prevention of Terrorism Act and its regulations and the Public Security Ordinance Act with a view to their repeal and the formulation of a new national security framework fully compliant with international law; 3. Justice (k) Review the Victim and Witness Protection Act with a view to incorporating better safeguards for the independence and effectiveness of the witness protection programme in accordance with international standards; ensure the independence and integrity of those appointed to the Witness Protection Authority and that the police personnel assigned to the programme are fully vetted; and ensure adequate resources for the witness protection system; (l) Accede to the International Convention on the Protection of All Persons from Enforced Disappearance, the Additional Protocols to the Geneva Conventions, and the Rome Statute of the International Criminal Court; (m) Enact legislation to criminalize war crimes, crimes against humanity, genocide and enforced disappearances without statutes of limitation; and enact various modes of criminal liability, in particular command or superior responsibility; (n) Adopt specific legislation establishing an ad hoc hybrid special court, integrating international judges, prosecutors, lawyers and investigators, mandated to try war crimes and crimes against humanity, with its own independent investigative and prosecuting organ, defence office and witness and victims protection programme, and provide it with the resources necessary for it to be able try those responsible to promptly and effectively; (o) Carry out a comprehensive mapping of all criminal investigations, habeas corpus and fundamental rights petitions relating to serious human rights violations, and of the findings of all commissions of inquiries where they have identified specific cases, and refer these cases to the special court upon its establishment; (p) Reinforce the forensic capacity of the judiciary and ensure that it is adequately resourced, including for DNA testing, forensic anthropology and archaeology; (q) Review all cases of detainees held under the Prevention of Terrorism Act and either release them or immediately bring them to trial; and review the cases of those convicted under the Act and serving long sentences, particularly where convictions were based on confessions extracted under torture; 4. Truth/right to know (r) Dispense with the current Presidential Commission on Missing Persons and transfer its cases to a credible and independent institution developed in consultation with families of the disappeared; (s) Develop a central database of all detainees, with independent verification, where relatives may obtain information of the whereabouts of family members detained, and publish a list of all detention centres; 18