Cleanup generator
Do not use ice nine core extension
Add TODO notes