remove some more unnecessary stuff