Remove more unneeded stuff