removed unnecessary ids