Security remediation

shape