diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/handlers/presenterAssigned.js b/bigbluebutton-html5/imports/api/2.0/users/server/handlers/presenterAssigned.js
index 060e5cd20edcf3c37900743c43147b7d56df4e16..64f7269cfec96cc82f8fc5ca53d187c235f803aa 100644
--- a/bigbluebutton-html5/imports/api/2.0/users/server/handlers/presenterAssigned.js
+++ b/bigbluebutton-html5/imports/api/2.0/users/server/handlers/presenterAssigned.js
@@ -6,15 +6,15 @@ const unassignCurrentPresenter = (meetingId, presenterId) => {
   const selector = {
     meetingId,
     userId: { $ne: presenterId },
-    'user.presenter': true,
+    presenter: true,
   };
 
   const modifier = {
     $set: {
-      'user.presenter': false,
+      presenter: false,
     },
     $pop: {
-      'user.roles': 'presenter',
+      roles: 'presenter',
     },
   };
 
@@ -41,10 +41,10 @@ export default function handlePresenterAssigned({ body }, meetingId) {
 
   const modifier = {
     $set: {
-      'user.presenter': true,
+      presenter: true,
     },
     $push: {
-      'user.roles': 'presenter',
+      roles: 'presenter',
     },
   };
 
diff --git a/bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js b/bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js
index e8e38d50fb9d40fd490c883eb6302973b3373177..e56361cf49b7be6a3df327617f4ebf76ee1a893e 100755
--- a/bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js
+++ b/bigbluebutton-html5/imports/api/2.0/users/server/methods/assignPresenter.js
@@ -33,7 +33,7 @@ export default function assignPresenter(credentials, userId) {
 
   const payload = {
     newPresenterId: userId,
-    newPresenterName: User.user.name,
+    newPresenterName: User.name,
     assignedBy: requesterUserId,
     requesterId: requesterUserId,
   };
diff --git a/bigbluebutton-html5/imports/api/acl/Acl.js b/bigbluebutton-html5/imports/api/acl/Acl.js
index 597d8365cbaf57c8682108c98f32846a75e6eec0..6cc0426a5c7b11a956529535b3e1c34dfb3679ee 100644
--- a/bigbluebutton-html5/imports/api/acl/Acl.js
+++ b/bigbluebutton-html5/imports/api/acl/Acl.js
@@ -52,7 +52,7 @@ export class Acl {
     const containRole = Acl.containsRole(user);
 
     if (containRole) {
-      const roles = user.user.roles;
+      const roles = user.roles;
       let permissions = {};
 
       roles.forEach((role) => {
@@ -66,7 +66,6 @@ export class Acl {
 
   static containsRole(user) {
     return Match.test(user, Object) &&
-        Match.test(user.user, Object) &&
-        Match.test(user.user.roles, Array);
+        Match.test(user.roles, Array);
   }
 }
diff --git a/bigbluebutton-html5/imports/startup/client/base.jsx b/bigbluebutton-html5/imports/startup/client/base.jsx
index d4f6dec0b17e756c731fc19f36d04b901ba6771a..02d3712680ca93b60580497b87f7b30145712a59 100644
--- a/bigbluebutton-html5/imports/startup/client/base.jsx
+++ b/bigbluebutton-html5/imports/startup/client/base.jsx
@@ -84,8 +84,7 @@ Base.propTypes = propTypes;
 Base.defaultProps = defaultProps;
 
 const SUBSCRIPTIONS_NAME = [
-  'users2x', 'users', 'chat', 'chat2x', 'cursor', 'cursor2x', 'deskshare', 'meetings', 'meetings2x',
-  'polls', 'polls2x', 'presentations', 'presentations2x', 'shapes', 'shapes2x', 'slides', 'slides2x', 'captions', 'captions2x', 'breakouts', 'breakouts2x',
+  'users2x', 'chat2x', 'cursor2x', 'meetings2x', 'polls2x', 'presentations2x', 'shapes2x', 'slides2x', 'captions2x', 'breakouts2x',
 ];
 
 const BaseContainer = createContainer(({ params }) => {
diff --git a/bigbluebutton-html5/imports/ui/components/audio/service.js b/bigbluebutton-html5/imports/ui/components/audio/service.js
index 7aa92057f2cf2fade4c3e633bda8136397cc8edc..d16e04f0a7a793b8fcfe0e455cd0fc8ef5f62bf5 100755
--- a/bigbluebutton-html5/imports/ui/components/audio/service.js
+++ b/bigbluebutton-html5/imports/ui/components/audio/service.js
@@ -9,7 +9,7 @@ let audioManager;
 const init = () => {
   const userId = Auth.userID;
   const User = Users.findOne({ userId });
-  const username = User.user.name;
+  const username = User.name;
   const Meeting = Meetings.findOne({ meetingId: User.meetingId });
   const voiceBridge = Meeting.voiceProp.voiceConf;
 
diff --git a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
index 52c32c161a8a5b2a9eb6555a5fa1dc311e135957..24701aa64b40472bb36d46a9afaaca80f72d19e1 100755
--- a/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
+++ b/bigbluebutton-html5/imports/ui/components/user-list/component.jsx
@@ -236,8 +236,6 @@ class UserList extends Component {
       },
     };
 
-    console.log("Users",users);
-
     return (
       <div className={styles.participants}>
         {
diff --git a/bigbluebutton-html5/server/main.js b/bigbluebutton-html5/server/main.js
index 1b86f4dcdebf0874c7012b334dac497a5e4220e3..7c9e47287d9b2eb1621cb2fde26bbf02ef992427 100755
--- a/bigbluebutton-html5/server/main.js
+++ b/bigbluebutton-html5/server/main.js
@@ -1,15 +1,4 @@
 import '/imports/startup/server';
-import '/imports/api/1.1/chat/server';
-import '/imports/api/1.1/cursor/server';
-import '/imports/api/1.1/deskshare/server';
-import '/imports/api/1.1/meetings/server';
-import '/imports/api/1.1/polls/server';
-import '/imports/api/1.1/breakouts/server';
-import '/imports/api/1.1/presentations/server';
-import '/imports/api/1.1/shapes/server';
-import '/imports/api/1.1/slides/server';
-import '/imports/api/1.1/captions/server';
-import '/imports/api/1.1/users/server';
 
 // 2x
 import '/imports/api/2.0/meetings/server';