[Generator] made some cleanup (unused code)
Merge pull request #449 from hhamon/dead_code_cleanup

[Generator] made some cleanup (unused code)