Removing remaining uses of Id, closing one of the oldest bugs #9