removed some more parts