removed some parts