FAT-44: cleanup