removed a bunch of needless stuff