removed unneeded "auto-inject"s
removed unneeded variable
fixed model generation
removed gen. files
additional changes