removed more unnecessary ids