Remove store creation, use container lookup instead