remove a ton of unnecessary code