removed some more crap
variables, dunno