removed a bunch of useless stuff