Revert "New Safezone"

This reverts commit 6f9fd723788386c4d861c1cd66e9688a6d5407c7.