Removed failsafe and some other things