Changes for removing sensitive data.