remove duplicate methods
Merge pull request #210 from adbatista/remove_duplication

[Misc] Remove duplicate methods from Generator