Removed failsafes