Remove lots of unneeded stuff