Remove old generator code