removing some id dependencies