Unused codes and typo