Removed unused class
Removed unused class
Removed unused constructor parameter
Removed unused throws declarations
Remove TEN_GEN and JAVASCRIPT modes