Updated code gen files
Clean up manualy created stubs. Update code generator script