Revert "Minor security additions"

This reverts commit 465028854197b65a22e701273f15556e1b8e9857.