Merge "Cleanup rs.spec file and code generator."