Remove more unneeded stuff.