removed a bit of unneeded stuff