remove some currently unneeded stuff