removed some more things