Remove the dependency between environments and stories