Removed generated id lines, reformat and fix warnings.