removed a bunch of unneeded stuff