store: cleanup the entry generation

Now that we use code use the entry API, we can cleanup they generation to reduce complexity and gain some performance back.