removed unnecessary id's