Removed generators that are not used anymore.
issue #1076