removed some more stuff