Removed a bunch of dangerous changes