remove more unneeded stuff