remove some (i think) undeeded stuff.