Remove test safeguard