diff --git a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
index dfd87d6fd44d246d210c1e7eaf9a4c5eefd76f36..15cc2b6b48bdffe0736cbdd6e5e918b3e5f5ef8a 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/BlackboardArtifact.java
@@ -24,15 +24,15 @@
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
 import java.util.ResourceBundle;
-import java.util.HashSet;
 import java.util.Set;
-import org.sleuthkit.datamodel.SleuthkitCase.ObjectInfo;
 import org.sleuthkit.datamodel.BlackboardArtifact.ARTIFACT_TYPE;
 import org.sleuthkit.datamodel.BlackboardAttribute.ATTRIBUTE_TYPE;
+import org.sleuthkit.datamodel.SleuthkitCase.ObjectInfo;
 
 /**
  * An artifact that has been posted to the blackboard. An artifact is a typed
@@ -78,7 +78,7 @@ public class BlackboardArtifact implements Content {
 	 * @param artifactID       The unique id for this artifact
 	 * @param sourceObjId      The unique id of the content with which this
 	 *                         artifact is associated.
-	 * @param artifactObjID    The unique id this artifact, in tsk_objects
+	 * @param artifactObjId    The unique id this artifact, in tsk_objects
 	 * @param dataSourceObjId  Object ID of the datasource where the artifact
 	 *                         was found.
 	 * @param artifactTypeID   The type id of this artifact.
diff --git a/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java b/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java
index c35551153613004b10b67936eca5e530f18fa756..cf2d21250235380e98c31839f26db36c4696863e 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/CommunicationsManager.java
@@ -64,16 +64,7 @@ public class CommunicationsManager {
 	private static final String RELATIONSHIP_ARTIFACT_TYPE_IDS_CSV_STR
 			= StringUtils.buildCSVString(RELATIONSHIP_ARTIFACT_TYPE_IDS);
 
-	// Artifact types that represent communications between accounts 
-	private static final Set<Integer> COMMUNICATION_ARTIFACT_TYPE_IDS
-			= new HashSet<Integer>(Arrays.asList(
-					BlackboardArtifact.ARTIFACT_TYPE.TSK_MESSAGE.getTypeID(),
-					BlackboardArtifact.ARTIFACT_TYPE.TSK_EMAIL_MSG.getTypeID(),
-					BlackboardArtifact.ARTIFACT_TYPE.TSK_CALLLOG.getTypeID()
-			));
-	private static final String COMMUNICATION_ARTIFACT_TYPE_IDS_CSV_STR
-			= StringUtils.buildCSVString(COMMUNICATION_ARTIFACT_TYPE_IDS);
-
+	
 	CommunicationsManager(SleuthkitCase db) throws TskCoreException {
 		this.db = db;
 
diff --git a/bindings/java/src/org/sleuthkit/datamodel/Relationship.java b/bindings/java/src/org/sleuthkit/datamodel/Relationship.java
index a132e787dacbdde28303748e6ffa4eeeda693c23..08c65f33a49d5898af4228069b720c598f8c21e8 100644
--- a/bindings/java/src/org/sleuthkit/datamodel/Relationship.java
+++ b/bindings/java/src/org/sleuthkit/datamodel/Relationship.java
@@ -31,6 +31,9 @@ public class Relationship {
 
 	public static final class Type {
 
+		private final String displayName;
+		private final String typeName;
+
 		public static final Type MESSAGE = new Type("MESSAGE", "Message");
 		public static final Type CALL_LOG = new Type("CALL_LOG", "Call Log");
 		public static final Type CONTACT = new Type("CONTACT", "Contact");
@@ -51,9 +54,6 @@ static Set<Relationship.Type> getPredefinedCommunicationTypes() {
 			return PREDEFINED_COMMUNICATION_TYPES;
 		}
 
-		private final String displayName;
-		private final String typeName;
-
 		private Type(String name, String displayName) {
 			this.typeName = name;
 			this.displayName = displayName;
diff --git a/bindings/java/test/org/sleuthkit/datamodel/CommunicationsManagerTest.java b/bindings/java/test/org/sleuthkit/datamodel/CommunicationsManagerTest.java
index 735ddae8a9c47209b31a0c99a2d70701e0af97a9..eecddb7ca5d7507ac3b7cc51c07548842390a83d 100644
--- a/bindings/java/test/org/sleuthkit/datamodel/CommunicationsManagerTest.java
+++ b/bindings/java/test/org/sleuthkit/datamodel/CommunicationsManagerTest.java
@@ -829,7 +829,7 @@ public void getRelationshipSourcesCountWithFilterTests() throws TskCoreException
 		{
 			CommunicationsFilter commsFilter = new CommunicationsFilter(Arrays.asList(
 					new DeviceFilter(Arrays.asList(DS1_DEVICEID, DS2_DEVICEID))
-			));;
+			));
 			long count = commsMgr.getRelationshipSourcesCount(PHONE_4_DS2, commsFilter);
 			assertEquals(3, count);
 
@@ -1207,7 +1207,7 @@ private static BlackboardArtifact addEmailMsgArtifact(String fromAddr, String to
 		if (senderAddressList.size() == 1) {
 			senderAddress = senderAddressList.get(0);
 			try {
-				senderAccountInstance = commsMgr.createAccountFileInstance(Account.Type.EMAIL, senderAddress, MODULE_NAME, abstractFile);
+				senderAccountInstance = commsMgr.createAccountFileInstance(EMAIL, senderAddress, MODULE_NAME, abstractFile);
 			} catch (TskCoreException ex) {
 				LOGGER.log(Level.WARNING, "Failed to create account for email address  " + senderAddress, ex); //NON-NLS
 			}