diff --git a/packages/presentation/src/index.ts b/packages/presentation/src/index.ts
index 54c3312e8c..f5f9afab42 100644
--- a/packages/presentation/src/index.ts
+++ b/packages/presentation/src/index.ts
@@ -22,4 +22,3 @@ export { default as Avatar } from './components/Avatar.svelte'
 export { default as MessageViewer } from './components/MessageViewer.svelte'
 export { default as AttributeEditor } from './components/AttributeEditor.svelte'
 export { default as Backlink } from './components/Backlink.svelte'
-export { default as CommentViewer } from './components/CommentViewer.svelte'
diff --git a/plugins/chunter-resources/package.json b/plugins/chunter-resources/package.json
index 69f75bc4d5..acfea87465 100644
--- a/plugins/chunter-resources/package.json
+++ b/plugins/chunter-resources/package.json
@@ -25,6 +25,7 @@
     "@anticrm/presentation":"~0.6.1",
     "@anticrm/chunter":"~0.6.0",
     "svelte":"^3.37.0",
-    "@anticrm/text-editor":"~0.6.0"
+    "@anticrm/text-editor":"~0.6.0",
+    "@anticrm/contact": "~0.6.0"
   }
 }
diff --git a/plugins/chunter-resources/src/components/Activity.svelte b/plugins/chunter-resources/src/components/Activity.svelte
index 3818500729..04992aa722 100644
--- a/plugins/chunter-resources/src/components/Activity.svelte
+++ b/plugins/chunter-resources/src/components/Activity.svelte
@@ -19,11 +19,12 @@
 import type { Doc } from '@anticrm/core'
 import { Backlink as BacklinkComponent } from '@anticrm/presentation'
 import type { Backlink } from '@anticrm/chunter'
-import { CommentViewer } from '@anticrm/presentation'
 import { ReferenceInput } from '@anticrm/text-editor'
 import { createQuery } from '@anticrm/presentation'
 import { Section, IconComments } from '@anticrm/ui'
+
 import Bookmark from './icons/Bookmark.svelte'
+import CommentViewer from './CommentViewer.svelte'
 
 import chunter from '@anticrm/chunter'
 
diff --git a/packages/presentation/src/components/Comment.svelte b/plugins/chunter-resources/src/components/Comment.svelte
similarity index 90%
rename from packages/presentation/src/components/Comment.svelte
rename to plugins/chunter-resources/src/components/Comment.svelte
index 546b537069..3a076cb6ae 100644
--- a/packages/presentation/src/components/Comment.svelte
+++ b/plugins/chunter-resources/src/components/Comment.svelte
@@ -14,15 +14,8 @@
 -->
 
 <script lang="ts">
-  import Avatar from './Avatar.svelte'
-
-  interface Person {
-    firstName: string
-    lastName: string
-    email: string
-    description: string
-    city: string
-  }
+  import type { Person } from '@anticrm/contact'
+  import { Avatar } from '@anticrm/presentation'
 
   interface IMessage {
     text: string
diff --git a/packages/presentation/src/components/CommentViewer.svelte b/plugins/chunter-resources/src/components/CommentViewer.svelte
similarity index 100%
rename from packages/presentation/src/components/CommentViewer.svelte
rename to plugins/chunter-resources/src/components/CommentViewer.svelte
diff --git a/plugins/task-resources/src/components/CreateTask.svelte b/plugins/task-resources/src/components/CreateTask.svelte
index f2c826e660..52fc313557 100644
--- a/plugins/task-resources/src/components/CreateTask.svelte
+++ b/plugins/task-resources/src/components/CreateTask.svelte
@@ -17,7 +17,7 @@
   import { createEventDispatcher } from 'svelte'
   import type { Ref, Space } from '@anticrm/core'
   import { DatePicker, EditBox, Dialog, Tabs, Section, Grid, Row, TextArea, IconComments } from '@anticrm/ui'
-  import { UserBox, CommentViewer } from '@anticrm/presentation'
+  import { UserBox } from '@anticrm/presentation'
   import { ReferenceInput } from '@anticrm/text-editor'
   import type { Person } from '@anticrm/contact'
   import File from './icons/File.svelte'
@@ -57,10 +57,10 @@
       <Row><ReferenceInput /></Row>
     </Grid>
   </Section>
-  <Section icon={IconComments} label={'Comments'}>
+  <!-- <Section icon={IconComments} label={'Comments'}>
     <CommentViewer />
     <div class="reference"><ReferenceInput /></div>
-  </Section>
+  </Section> -->
 </Dialog>
 
 <style lang="scss">
diff --git a/server/upload/src/app.ts b/server/upload/src/app.ts
index 0e20a7625e..28b8afaeb6 100644
--- a/server/upload/src/app.ts
+++ b/server/upload/src/app.ts
@@ -21,7 +21,7 @@ import { v4 as uuid } from 'uuid'
 
 const BUCKET = 'anticrm-upload-9e4e89c'
 
-async function awsUpload(file: UploadedFile) {
+async function awsUpload (file: UploadedFile): Promise<S3.ManagedUpload.SendData> {
   console.log(file)
   const s3 = new S3()
   const resp = await s3.upload({
@@ -29,9 +29,10 @@ async function awsUpload(file: UploadedFile) {
     Key: uuid(),
     Body: file.data,
     ContentType: file.mimetype,
-    ACL: 'public-read' 
+    ACL: 'public-read'
   }).promise()
   console.log(resp)
+  return resp
 }
 
 /**
@@ -48,8 +49,8 @@ export function start (port: number): void {
 
     if (file !== undefined) {
       awsUpload(file as UploadedFile)
-      .then(() => res.status(200).send())
-      .catch(error => console.log(error))
+        .then(() => res.status(200).send())
+        .catch(error => console.log(error))
     } else {
       res.status(400).send()
     }