Cleanup comments
Update generated files