removing more unneeded stuff.