removed generator from datastructure