4.4 security cleanup