Added Safezone-Turnoff back in and did some more cleanup

Signed-off-by: Harry Young <hendrik.gerritzen@googlemail.com>