removed some unnnecesarry id's