more cleanup, remove dependencies
fix possible exception
workarround possible exception
add unit tests for all generators