Resource efficient remediation - WRAP