diff --git a/src/etapi/attachments.js b/src/etapi/attachments.js
index d46eeb4a9..8fcd10a15 100644
--- a/src/etapi/attachments.js
+++ b/src/etapi/attachments.js
@@ -2,8 +2,7 @@ const becca = require("../becca/becca");
 const eu = require("./etapi_utils");
 const mappers = require("./mappers");
 const v = require("./validators");
-const utils = require("../services/utils.js");
-const noteService = require("../services/notes.js");
+const utils = require("../services/utils");
 
 function register(router) {
     const ALLOWED_PROPERTIES_FOR_CREATE_ATTACHMENT = {
diff --git a/src/etapi/branches.js b/src/etapi/branches.js
index daa51cabb..c62caf036 100644
--- a/src/etapi/branches.js
+++ b/src/etapi/branches.js
@@ -13,7 +13,6 @@ function register(router) {
     });
 
     const ALLOWED_PROPERTIES_FOR_CREATE_BRANCH = {
-        'branchId': [v.mandatory, v.notNull, v.isValidEntityId],
         'noteId': [v.mandatory, v.notNull, v.isNoteId],
         'parentNoteId': [v.mandatory, v.notNull, v.isNoteId],
         'notePosition': [v.notNull, v.isInteger],
diff --git a/src/etapi/notes.js b/src/etapi/notes.js
index 6e68f98f3..2ed7964d8 100644
--- a/src/etapi/notes.js
+++ b/src/etapi/notes.js
@@ -49,8 +49,7 @@ function register(router) {
         'notePosition': [v.notNull, v.isInteger],
         'prefix': [v.notNull, v.isString],
         'isExpanded': [v.notNull, v.isBoolean],
-        'noteId': [v.notNull, v.isValidEntityId],
-        'branchId': [v.notNull, v.isValidEntityId],
+        'noteId': [v.notNull, v.isValidEntityId]
     };
 
     eu.route(router, 'post' ,'/etapi/create-note', (req, res, next) => {
diff --git a/test-etapi/create-entities.http b/test-etapi/create-entities.http
index b5e7fd52a..09262aa00 100644
--- a/test-etapi/create-entities.http
+++ b/test-etapi/create-entities.http
@@ -4,7 +4,6 @@ Content-Type: application/json
 
 {
   "noteId": "forcedId{{$randomInt}}",
-  "branchId": "forcedId{{$randomInt}}",
   "parentNoteId": "root",
   "title": "Hello",
   "type": "text",
@@ -15,7 +14,6 @@ Content-Type: application/json
     client.assert(response.status === 201);
     client.assert(response.body.note.noteId.startsWith("forcedId"));
     client.assert(response.body.note.title == "Hello");
-    client.assert(response.body.branch.branchId.startsWith("forcedId"));
     client.assert(response.body.branch.parentNoteId == "root");
 
     client.log(`Created note ` + response.body.note.noteId + ` and branch ` + response.body.branch.branchId);
@@ -31,14 +29,13 @@ Authorization: {{authToken}}
 Content-Type: application/json
 
 {
-  "branchId": "forcedClonedId",
   "noteId": "{{createdNoteId}}",
-  "parentNoteId": '_hidden'
+  "parentNoteId": "_hidden"
 }
 
 > {%
     client.assert(response.status === 201);
-    client.assert(response.body.parentNoteId == '_hidden');
+    client.assert(response.body.parentNoteId == "_hidden");
 
     client.global.set("clonedBranchId", response.body.branchId);
 
@@ -122,3 +119,36 @@ Authorization: {{authToken}}
     client.assert(response.status === 200);
     client.assert(response.body.attributeId == client.global.get("createdAttributeId"));
 %}
+
+###
+
+POST {{triliumHost}}/etapi/attachments
+Content-Type: application/json
+Authorization: {{authToken}}
+
+{
+  "parentId": "{{createdNoteId}}",
+  "role": "file",
+  "mime": "plain/text",
+  "title": "my attachment",
+  "content": "my text"
+}
+
+> {%
+    client.assert(response.status === 201);
+
+    client.global.set("createdAttachmentId", response.body.attachmentId);
+%}
+
+###
+
+GET {{triliumHost}}/etapi/attachments/{{createdAttachmentId}}
+Authorization: {{authToken}}
+
+> {%
+    client.assert(response.status === 200);
+    client.assert(response.body.attachmentId == client.global.get("createdAttachmentId"));
+    client.assert(response.body.role == "file");
+    client.assert(response.body.mime == "plain/text");
+    client.assert(response.body.title == "my attachment");
+%}