Datasheets leftovers removed, another bug fixed