Make sure all imports are generated.
Removed out commented code.