removed unused code, added missing ids