removed a ton of unnecessary code