diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
index 349b6c3cea..2c84789a18 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypeIdGlobalSettingsPanel.java
@@ -634,13 +634,8 @@ final class FileTypeIdGlobalSettingsPanel extends IngestModuleGlobalSettingsPane
* Get the offset.
*/
long offset;
- try {
- if(isFooterCheckBox.isSelected()) {
- offset = -1;
- }
- else {
- offset = Long.parseUnsignedLong(offsetTextField.getText());
- }
+ try {
+ offset = isFooterCheckBox.isSelected() ? -1 : Long.parseUnsignedLong(offsetTextField.getText());
} catch (NumberFormatException ex) {
JOptionPane.showMessageDialog(null,
NbBundle.getMessage(FileTypeIdGlobalSettingsPanel.class, "FileTypeIdGlobalSettingsPanel.JOptionPane.invalidOffset.message"),
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypes.xsd b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypes.xsd
index 26aa720ff1..6ae9505c76 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypes.xsd
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/FileTypes.xsd
@@ -13,19 +13,25 @@
-
-
+
+
+
+
+
+
+
+
-
+
diff --git a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/UserDefinedFileTypesManager.java b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/UserDefinedFileTypesManager.java
index 3622cceaf6..d5777cb281 100644
--- a/Core/src/org/sleuthkit/autopsy/modules/filetypeid/UserDefinedFileTypesManager.java
+++ b/Core/src/org/sleuthkit/autopsy/modules/filetypeid/UserDefinedFileTypesManager.java
@@ -224,12 +224,6 @@ final class UserDefinedFileTypesManager {
// Add rule for .pfm
fileType = new FileType("image/x-portable-floatmap", new Signature("PF", 0L), "", false); //NON-NLS
fileTypes.put(fileType.getMimeType(), fileType);
-
- // Add rule for .tga
- byteArray = DatatypeConverter.parseHexBinary("54525545564953494F4E2D5846494C452E00");
- fileType = new FileType("image/x-tga", new Signature(byteArray, true), "", false); // NON-NLS
- fileTypes.put(fileType.getMimeType(), fileType);
-
}
// parseHexBinary() throws this if the argument passed in is not Hex
catch (IllegalArgumentException e) {